Renamed files to a consistent naming convention