Renames files to improve consistency and future conventions