diff --git a/samples/javaconfig/gemfire-clientserver/src/main/java/sample/client/SessionServlet.java b/samples/javaconfig/gemfire-clientserver/src/main/java/sample/client/SessionServlet.java
index a223020..67b1a59 100644
--- a/samples/javaconfig/gemfire-clientserver/src/main/java/sample/client/SessionServlet.java
+++ b/samples/javaconfig/gemfire-clientserver/src/main/java/sample/client/SessionServlet.java
@@ -41,4 +41,4 @@ public class SessionServlet extends HttpServlet {
 		response.sendRedirect(request.getContextPath() + "/");
 	}
 }
-// tag::end[]
+// end::class[]
diff --git a/samples/javaconfig/gemfire-p2p/src/main/java/sample/SessionServlet.java b/samples/javaconfig/gemfire-p2p/src/main/java/sample/SessionServlet.java
index 7a29be3..bceb669 100644
--- a/samples/javaconfig/gemfire-p2p/src/main/java/sample/SessionServlet.java
+++ b/samples/javaconfig/gemfire-p2p/src/main/java/sample/SessionServlet.java
@@ -41,4 +41,4 @@ public class SessionServlet extends HttpServlet {
 		response.sendRedirect(request.getContextPath() + "/");
 	}
 }
-// tag::end[]
+// end::class[]
diff --git a/samples/xml/gemfire-clientserver/src/main/java/sample/client/SessionServlet.java b/samples/xml/gemfire-clientserver/src/main/java/sample/client/SessionServlet.java
index 3534f86..b66335b 100644
--- a/samples/xml/gemfire-clientserver/src/main/java/sample/client/SessionServlet.java
+++ b/samples/xml/gemfire-clientserver/src/main/java/sample/client/SessionServlet.java
@@ -39,4 +39,4 @@ public class SessionServlet extends HttpServlet {
 		response.sendRedirect(request.getContextPath() + "/");
 	}
 }
-// tag::end[]
+// end::class[]
diff --git a/samples/xml/gemfire-clientserver/src/main/java/sample/server/GemFireServer.java b/samples/xml/gemfire-clientserver/src/main/java/sample/server/GemFireServer.java
index ec346df..a794d60 100644
--- a/samples/xml/gemfire-clientserver/src/main/java/sample/server/GemFireServer.java
+++ b/samples/xml/gemfire-clientserver/src/main/java/sample/server/GemFireServer.java
@@ -29,4 +29,4 @@ public class GemFireServer {
 		new AnnotationConfigApplicationContext(GemFireServer.class).registerShutdownHook();
 	}
 }
-// tag::end[]
+// end::class[]