Also renamed some schema files which did not match their classnames-- there might be others. CRM-11583