Small edits, renames, etc.