spelling and renaming