Renaming and comments in CorePrep