Renaming and comments