Huge renaming with minimal refactor