Renamed files to conform with new naming