Renamed the files to reflect the new naming convention.