renames and comment changes