diff --git a/webapp/config/web.xml b/webapp/config/web.xml
index 3760ea3c6..dd7d13aaf 100644
--- a/webapp/config/web.xml
+++ b/webapp/config/web.xml
@@ -450,11 +450,11 @@
   </servlet-mapping>
 
   <servlet>
-    <servlet-name>EmptyController</servlet-name>
-    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.EmptyController</servlet-class>
+    <servlet-name>StaticPageController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.StaticPageController</servlet-class>
   </servlet>
   <servlet-mapping>
-    <servlet-name>EmptyController</servlet-name>
+    <servlet-name>StaticPageController</servlet-name>
     <url-pattern>/login</url-pattern>
   </servlet-mapping>
   
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/EmptyController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/StaticPageController.java
similarity index 87%
rename from webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/EmptyController.java
rename to webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/StaticPageController.java
index 1ffb47168..b4c115f6a 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/EmptyController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/StaticPageController.java
@@ -14,12 +14,12 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.Tem
 
 /*
  * Servlet that only specifies a template, without putting any data
- * into the template model.
+ * into the template model. Page content is fully specified in the template.
  */
-public class EmptyController extends FreemarkerHttpServlet {
+public class StaticPageController extends FreemarkerHttpServlet {
 
     private static final long serialVersionUID = 1L;
-    private static final Log log = LogFactory.getLog(EmptyController.class);
+    private static final Log log = LogFactory.getLog(StaticPageController.class);
     
     @SuppressWarnings("serial")
     private static final Map<String, String> urlsToTemplates = new HashMap<String, String>(){