More edits and a rename