A whole lot of cleanup and renaming