diff --git a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/ValidatingRepositoryEventListener.java b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/ValidatingRepositoryEventListener.java
index 7e2846158..5df2dcbcd 100644
--- a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/ValidatingRepositoryEventListener.java
+++ b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/context/ValidatingRepositoryEventListener.java
@@ -68,11 +68,11 @@ public class ValidatingRepositoryEventListener
   }
 
   @Override protected void onBeforeLinkSave(Object parent, Object linked) {
-    validate("beforeChildSave", parent);
+    validate("beforeLinkSave", parent);
   }
 
   @Override protected void onAfterLinkSave(Object parent, Object linked) {
-    validate("afterChildSave", parent);
+    validate("afterLinkSave", parent);
   }
 
   @Override protected void onBeforeDelete(Object entity) {
diff --git a/spring-data-rest-webmvc/src/test/resources/META-INF/spring-data-rest/repositories-export.xml b/spring-data-rest-webmvc/src/test/resources/META-INF/spring-data-rest/repositories-export.xml
index 96488c1ac..69e2a18ef 100644
--- a/spring-data-rest-webmvc/src/test/resources/META-INF/spring-data-rest/repositories-export.xml
+++ b/spring-data-rest-webmvc/src/test/resources/META-INF/spring-data-rest/repositories-export.xml
@@ -9,6 +9,20 @@
 
   <jpa:repositories base-package="org.springframework.data.rest.test.webmvc"/>
 
+  <!--
+    This validator will be picked up automatically. The default configuration is to look at the bean name
+    and figure out what event you're interested in. This validator is interested in 'beforeSave' events
+    because the word 'beforeSave' appears in the first part of the bean name. It recognizes:
+
+      - beforeSave
+      - afterSave
+      - beforeDelete
+      - afterDelete
+      - beforeLinkSave
+      - afterLinkSave
+
+    What you put after that doesn't matter, you just need to make the bean name unique, of course.
+  -->
   <bean id="beforeSavePersonValidator" class="org.springframework.data.rest.test.webmvc.PersonValidator"/>
 
 </beans>
\ No newline at end of file