Rename files for PEP8 consistency