Refactored NameFix