diff --git a/interfaces/src/main/resources/xsd/FixInterfaces.xsd b/interfaces/src/main/resources/xsd/interfaces.xsd
similarity index 100%
rename from interfaces/src/main/resources/xsd/FixInterfaces.xsd
rename to interfaces/src/main/resources/xsd/interfaces.xsd
diff --git a/repository/src/main/java/io/fixprotocol/orchestra/repository/RepositoryValidator.java b/repository/src/main/java/io/fixprotocol/orchestra/repository/RepositoryValidator.java
index 0f3d2944..62c73da7 100644
--- a/repository/src/main/java/io/fixprotocol/orchestra/repository/RepositoryValidator.java
+++ b/repository/src/main/java/io/fixprotocol/orchestra/repository/RepositoryValidator.java
@@ -247,7 +247,7 @@ public void validate(InputStream repositoryInstance)
     factory.setResourceResolver(resourceResolver);
 
     // load a WXS schema, represented by a Schema instance
-    URL resourceUrl = this.getClass().getClassLoader().getResource("xsd/FixRepository2016.xsd");
+    URL resourceUrl = this.getClass().getClassLoader().getResource("xsd/repository.xsd");
     String path = resourceUrl.getPath();
     String parentPath = path.substring(0, path.lastIndexOf('/'));
     URL baseUrl = new URL(resourceUrl.getProtocol(), null, parentPath);
diff --git a/repository/src/main/resources/xsd/FixRepository2016.xsd b/repository/src/main/resources/xsd/repository.xsd
similarity index 99%
rename from repository/src/main/resources/xsd/FixRepository2016.xsd
rename to repository/src/main/resources/xsd/repository.xsd
index bbf2ba74..69637b58 100644
--- a/repository/src/main/resources/xsd/FixRepository2016.xsd
+++ b/repository/src/main/resources/xsd/repository.xsd
@@ -10,7 +10,7 @@
 	</xs:annotation>
 	<!-- includes xml:base to support XInclude -->
 	<xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/03/xml.xsd"/>
-	<xs:include schemaLocation="repositorytypes2016.xsd"/>
+	<xs:include schemaLocation="repositorytypes.xsd"/>
 	<xs:import namespace="http://purl.org/dc/terms/" schemaLocation="dcterms.xsd"/>
 	<xs:element name="actors">
 		<xs:annotation>
diff --git a/repository/src/main/resources/xsd/repositorytypes2016.xsd b/repository/src/main/resources/xsd/repositorytypes.xsd
similarity index 100%
rename from repository/src/main/resources/xsd/repositorytypes2016.xsd
rename to repository/src/main/resources/xsd/repositorytypes.xsd