Comments and renaming.