Updates and renames
Cleanup and such
blah