Small renames and comments