Renamed the new files to be more consistent