Renamed schema files to use underscore rather than dashes for separators