Various renames and tweaks

God damn, I'm terrible at this shit.