Renamed some files to follow syntax used by other files