Renames files to be more consistent with the project