Small edits and renames