Final name refactoring