Comments and renaming