comments and renaming