Huge renaming and cleanup