diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java
index a5eb16dff..cf6cbd8dd 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java
@@ -75,7 +75,7 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
     static protected String listViewConfigFileQueryString =
         "PREFIX display: <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#>" +
         "SELECT ?property ?filename WHERE { \n" +
-        "    ?property display:listViewConfigurationFile ?filename . \n" +
+        "    ?property display:listViewConfigFile ?filename . \n" +
         "} LIMIT 1";
     
     static protected Query listViewConfigFileQuery;
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJena.java
index 10f26b59d..3e40e5509 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJena.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJena.java
@@ -278,7 +278,5 @@ public class ObjectPropertyStatementDaoJena extends JenaBaseDao implements Objec
         }
         return list;
     }
-    
-
-    
+ 
 }
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java
index 7641c2bd4..589c9cb48 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java
@@ -80,7 +80,7 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel
     
     private class PropertyListConfig {
 
-        private static final String DEFAULT_CONFIG_FILE = "objectPropertyList-default.xml";
+        private static final String DEFAULT_CONFIG_FILE = "listViewConfig-default.xml";
         private static final String CONFIG_FILE_PATH = "/config/";
         private static final String NODE_NAME_QUERY = "query";
         private static final String NODE_NAME_TEMPLATE = "template";
diff --git a/webapp/web/config/objectPropertyList-default.xml b/webapp/web/config/listViewConfig-default.xml
similarity index 85%
rename from webapp/web/config/objectPropertyList-default.xml
rename to webapp/web/config/listViewConfig-default.xml
index 6715a2857..2ebfbc8b2 100644
--- a/webapp/web/config/objectPropertyList-default.xml
+++ b/webapp/web/config/listViewConfig-default.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-<view-config>
+<list-view-config>
     <query>    
         PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
         PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;  
@@ -14,9 +14,7 @@
     
     <collation-target>object</collation-target>
     
-    <link-target>object</link-target>
-    
     <preprocessor>edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.DefaultObjectPropertyDataPreprocessor</preprocessor>
     
-    <template>shortView-default.ftl</template>
-</view-config>
\ No newline at end of file
+    <template>propStatement-default.ftl</template>
+</list-view-config>
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/individual/individual.ftl b/webapp/web/templates/freemarker/body/individual/individual.ftl
index af3b5c164..0af2975b1 100644
--- a/webapp/web/templates/freemarker/body/individual/individual.ftl
+++ b/webapp/web/templates/freemarker/body/individual/individual.ftl
@@ -12,7 +12,6 @@
     <#include "individual-adminPanel.ftl">
 </#if>
 
-<#-- Manolo, please do not remove this line. Thanks! -->
 <#assign propertyGroups = individual.propertyList>
     
 <section id="individual-intro-person" class="vcard" role="region">
diff --git a/webapp/web/templates/freemarker/body/partials/individual/shortView-default.ftl b/webapp/web/templates/freemarker/body/partials/individual/propStatement-default.ftl
similarity index 72%
rename from webapp/web/templates/freemarker/body/partials/individual/shortView-default.ftl
rename to webapp/web/templates/freemarker/body/partials/individual/propStatement-default.ftl
index 990add253..6a6650797 100644
--- a/webapp/web/templates/freemarker/body/partials/individual/shortView-default.ftl
+++ b/webapp/web/templates/freemarker/body/partials/individual/propStatement-default.ftl
@@ -1,5 +1,5 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
-<#-- Default object property statement short view template -->
+<#-- Default object property statement template -->
 
 <a href="${url(statement.object)}">${statement.name!}</a> ${statement.moniker!}