Created FinalNameFixer