A bunch of renames
Minor tweaks