Rename source files to be more uniform