renames and comments