Rework name ID format handling to fix bug SC-23