diff --git a/src/extension/app-schema/app-schema-test/src/test/java/org/geoserver/test/FeatureGML32Test.java b/src/extension/app-schema/app-schema-test/src/test/java/org/geoserver/test/FeatureGML32Test.java
index 57b29abd69c..dcc0933f9c8 100644
--- a/src/extension/app-schema/app-schema-test/src/test/java/org/geoserver/test/FeatureGML32Test.java
+++ b/src/extension/app-schema/app-schema-test/src/test/java/org/geoserver/test/FeatureGML32Test.java
@@ -117,7 +117,7 @@ public void testStoredQuery() throws Exception {
      * Test encoding of a multivalued mapping with an xlink:href ClientProperty.
      */
     @Test
-    public void testMultivaluedXlinkHrefClientProperty() {
+    public void testMultivaluedXlinkHref() {
         Document doc = getAsDOM(
                 "wfs?service=WFS&version=2.0.0&request=GetFeature&typenames=gsml:GeologicUnit");
         LOGGER.info("WFS GetFeature, typename=gsml:GeologicUnit response:\n" + prettyString(doc));
diff --git a/src/extension/app-schema/app-schema-test/src/test/java/org/geoserver/test/MultivaluedXlinkHrefClientPropertyMockData.java b/src/extension/app-schema/app-schema-test/src/test/java/org/geoserver/test/MultivaluedXlinkHrefMockData.java
similarity index 68%
rename from src/extension/app-schema/app-schema-test/src/test/java/org/geoserver/test/MultivaluedXlinkHrefClientPropertyMockData.java
rename to src/extension/app-schema/app-schema-test/src/test/java/org/geoserver/test/MultivaluedXlinkHrefMockData.java
index a1d3d0ef006..f3b59004ba9 100644
--- a/src/extension/app-schema/app-schema-test/src/test/java/org/geoserver/test/MultivaluedXlinkHrefClientPropertyMockData.java
+++ b/src/extension/app-schema/app-schema-test/src/test/java/org/geoserver/test/MultivaluedXlinkHrefMockData.java
@@ -10,16 +10,16 @@
  * 
  * @author Ben Caradoc-Davies (Transient Software Limited)
  */
-public class MultivaluedXlinkHrefClientPropertyMockData extends AbstractAppSchemaMockData {
+public class MultivaluedXlinkHrefMockData extends AbstractAppSchemaMockData {
 
-    public MultivaluedXlinkHrefClientPropertyMockData() {
+    public MultivaluedXlinkHrefMockData() {
         super(GML32_NAMESPACES);
     }
 
     @Override
     public void addContent() {
-        addFeatureType(GSML_PREFIX, "GeologicUnit", "MultivaluedXlinkHrefClientProperty.xml",
-                "MultivaluedXlinkHrefClientProperty.properties");
+        addFeatureType(GSML_PREFIX, "GeologicUnit", "MultivaluedXlinkHref.xml",
+                "MultivaluedXlinkHref.properties");
     }
 
 }
diff --git a/src/extension/app-schema/app-schema-test/src/test/java/org/geoserver/test/MultivaluedXlinkHrefClientPropertyTest.java b/src/extension/app-schema/app-schema-test/src/test/java/org/geoserver/test/MultivaluedXlinkHrefTest.java
similarity index 96%
rename from src/extension/app-schema/app-schema-test/src/test/java/org/geoserver/test/MultivaluedXlinkHrefClientPropertyTest.java
rename to src/extension/app-schema/app-schema-test/src/test/java/org/geoserver/test/MultivaluedXlinkHrefTest.java
index 31652338ff7..ce237173e51 100644
--- a/src/extension/app-schema/app-schema-test/src/test/java/org/geoserver/test/MultivaluedXlinkHrefClientPropertyTest.java
+++ b/src/extension/app-schema/app-schema-test/src/test/java/org/geoserver/test/MultivaluedXlinkHrefTest.java
@@ -13,11 +13,11 @@
  * 
  * @author Ben Caradoc-Davies (Transient Software Limited)
  */
-public class MultivaluedXlinkHrefClientPropertyTest extends AbstractAppSchemaTestSupport {
+public class MultivaluedXlinkHrefTest extends AbstractAppSchemaTestSupport {
 
     @Override
-    protected MultivaluedXlinkHrefClientPropertyMockData createTestData() {
-        return new MultivaluedXlinkHrefClientPropertyMockData();
+    protected MultivaluedXlinkHrefMockData createTestData() {
+        return new MultivaluedXlinkHrefMockData();
     }
 
     /**
diff --git a/src/extension/app-schema/app-schema-test/src/test/resources/test-data/MultivaluedXlinkHrefClientProperty.properties b/src/extension/app-schema/app-schema-test/src/test/resources/test-data/MultivaluedXlinkHref.properties
similarity index 100%
rename from src/extension/app-schema/app-schema-test/src/test/resources/test-data/MultivaluedXlinkHrefClientProperty.properties
rename to src/extension/app-schema/app-schema-test/src/test/resources/test-data/MultivaluedXlinkHref.properties
diff --git a/src/extension/app-schema/app-schema-test/src/test/resources/test-data/MultivaluedXlinkHrefClientProperty.xml b/src/extension/app-schema/app-schema-test/src/test/resources/test-data/MultivaluedXlinkHref.xml
similarity index 96%
rename from src/extension/app-schema/app-schema-test/src/test/resources/test-data/MultivaluedXlinkHrefClientProperty.xml
rename to src/extension/app-schema/app-schema-test/src/test/resources/test-data/MultivaluedXlinkHref.xml
index 4ad40e66ea7..96d9678aad2 100644
--- a/src/extension/app-schema/app-schema-test/src/test/resources/test-data/MultivaluedXlinkHrefClientProperty.xml
+++ b/src/extension/app-schema/app-schema-test/src/test/resources/test-data/MultivaluedXlinkHref.xml
@@ -31,7 +31,7 @@
     <typeMappings>
         <FeatureTypeMapping>
             <sourceDataStore>datastore</sourceDataStore>
-            <sourceType>MultivaluedXlinkHrefClientProperty</sourceType>
+            <sourceType>MultivaluedXlinkHref</sourceType>
             <targetElement>gsml:GeologicUnit</targetElement>
             <attributeMappings>
                 <AttributeMapping>