diff --git a/samples/xml/gemfire-clientserver/src/main/java/sample/Application.java b/samples/xml/gemfire-clientserver/src/main/java/sample/ServerConfig.java
similarity index 90%
rename from samples/xml/gemfire-clientserver/src/main/java/sample/Application.java
rename to samples/xml/gemfire-clientserver/src/main/java/sample/ServerConfig.java
index 4c477df..3f9af2d 100644
--- a/samples/xml/gemfire-clientserver/src/main/java/sample/Application.java
+++ b/samples/xml/gemfire-clientserver/src/main/java/sample/ServerConfig.java
@@ -24,10 +24,10 @@ import org.springframework.context.annotation.ImportResource;
 // tag::class[]
 @Configuration // <1>
 @ImportResource("META-INF/spring/session-server.xml") // <2>
-public class Application {
+public class ServerConfig {
 
 	public static void main(String[] args) {
-		new AnnotationConfigApplicationContext(Application.class).registerShutdownHook();
+		new AnnotationConfigApplicationContext(ServerConfig.class).registerShutdownHook();
 	}
 }
 // tag::end[]
diff --git a/samples/xml/gemfire-clientserver/src/main/java/sample/SessionServlet.java b/samples/xml/gemfire-clientserver/src/main/java/sample/SessionServlet.java
index b030339..427ba80 100644
--- a/samples/xml/gemfire-clientserver/src/main/java/sample/SessionServlet.java
+++ b/samples/xml/gemfire-clientserver/src/main/java/sample/SessionServlet.java
@@ -26,15 +26,17 @@ import javax.servlet.http.HttpServletResponse;
 // tag::class[]
 public class SessionServlet extends HttpServlet {
 
+	private static final long serialVersionUID = 2878267318695777395L;
+
 	@Override
 	protected void doPost(HttpServletRequest request, HttpServletResponse response)
 			throws ServletException, IOException {
+
 		String attributeName = request.getParameter("attributeName");
 		String attributeValue = request.getParameter("attributeValue");
+
 		request.getSession().setAttribute(attributeName, attributeValue);
 		response.sendRedirect(request.getContextPath() + "/");
 	}
-
-	private static final long serialVersionUID = 2878267318695777395L;
 }
 // tag::end[]
diff --git a/samples/xml/gemfire-clientserver/src/main/resources/META-INF/spring/application.properties b/samples/xml/gemfire-clientserver/src/main/resources/META-INF/spring/application.properties
index 98fbf19..31648e7 100644
--- a/samples/xml/gemfire-clientserver/src/main/resources/META-INF/spring/application.properties
+++ b/samples/xml/gemfire-clientserver/src/main/resources/META-INF/spring/application.properties
@@ -1,2 +1,2 @@
 application.gemfire.client-server.host=localhost
-application.gemfire.client-server.port=12480
+application.gemfire.client-server.port=40404
diff --git a/samples/xml/gemfire-clientserver/src/main/resources/META-INF/spring/session-server.xml b/samples/xml/gemfire-clientserver/src/main/resources/META-INF/spring/session-server.xml
index 6426b7f..cf23bcc 100644
--- a/samples/xml/gemfire-clientserver/src/main/resources/META-INF/spring/session-server.xml
+++ b/samples/xml/gemfire-clientserver/src/main/resources/META-INF/spring/session-server.xml
@@ -36,9 +36,9 @@
 
 	<!--5-->
 	<gfe:cache-server auto-startup="true"
-                      bind-address="${application.gemfire.client-server.host}"
-                      host-name-for-clients="${application.gemfire.client-server.host}"
-                      port="${spring.session.data.gemfire.port:${application.gemfire.client-server.port}}"/>
+                      bind-address="${application.gemfire.client-server.host:localhost}"
+                      host-name-for-clients="${application.gemfire.client-server.host:localhost}"
+                      port="${spring.session.data.gemfire.port:${application.gemfire.client-server.port:40404}}"/>
 
 	<!--6-->
 	<bean class="org.springframework.session.data.gemfire.config.annotation.web.http.GemFireHttpSessionConfiguration"