Codebase cleanups - renaming files.