diff --git a/productMods/WEB-INF/ontologies/user/vivo-core-1.1-annotations.rdf b/productMods/WEB-INF/ontologies/user/vivo-core-1.1-annotations.rdf
index ade4b20a..5d9d52ce 100644
--- a/productMods/WEB-INF/ontologies/user/vivo-core-1.1-annotations.rdf
+++ b/productMods/WEB-INF/ontologies/user/vivo-core-1.1-annotations.rdf
@@ -1271,6 +1271,7 @@ display level 	</vitro:publicDescriptionAnnot>
     <vitro:fullPropertyNameAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">providesService</vitro:fullPropertyNameAnnot>
   </rdf:Description>
   <rdf:Description rdf:about="http://vivoweb.org/ontology/core#ClinicalRole">
+    <vitro:customShortViewAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">clinicalRoleShortView.jsp</vitro:customShortViewAnnot>
     <vitro:displayLimitAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#int">-1</vitro:displayLimitAnnot>
     <vitro:displayRankAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#int">-1</vitro:displayRankAnnot>
     <vitro:hiddenFromDisplayBelowRoleLevelAnnot rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/role#public"/>
@@ -1791,7 +1792,7 @@ display level 	</vitro:publicDescriptionAnnot>
     <vitro:displayLimitAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#int">5</vitro:displayLimitAnnot>
   </rdf:Description>
   <rdf:Description rdf:about="http://vivoweb.org/ontology/core#TeacherRole">
-    <vitro:customShortViewAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">teachingActivityRoleShortView.jsp</vitro:customShortViewAnnot>
+    <vitro:customShortViewAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">teacherRoleShortView.jsp</vitro:customShortViewAnnot>
     <vitro:displayRankAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#int">-1</vitro:displayRankAnnot>
     <vitro:hiddenFromDisplayBelowRoleLevelAnnot rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/role#public"/>
     <vitro:displayLimitAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#int">-1</vitro:displayLimitAnnot>
@@ -1810,6 +1811,7 @@ display level 	</vitro:publicDescriptionAnnot>
     <vitro:hiddenFromDisplayBelowRoleLevelAnnot rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody"/>
   </rdf:Description>
   <rdf:Description rdf:about="http://vivoweb.org/ontology/core#ResearcherRole">
+    <vitro:customShortViewAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">researcherRoleShortView.jsp</vitro:customShortViewAnnot>
     <vitro:displayLimitAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#int">-1</vitro:displayLimitAnnot>
     <vitro:prohibitedFromUpdateBelowRoleLevelAnnot rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/role#public"/>
     <vitro:hiddenFromDisplayBelowRoleLevelAnnot rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/role#public"/>
@@ -2280,6 +2282,7 @@ display level 	</vitro:publicDescriptionAnnot>
     <vitro:prohibitedFromUpdateBelowRoleLevelAnnot rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/role#public"/>
   </rdf:Description>
   <rdf:Description rdf:about="http://vivoweb.org/ontology/core#PrincipalInvestigatorRole">
+    <vitro:customShortViewAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">grantPiRoleShortView.jsp</vitro:customShortViewAnnot>
     <vitro:prohibitedFromUpdateBelowRoleLevelAnnot rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/role#public"/>
     <vitro:displayLimitAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#int">-1</vitro:displayLimitAnnot>
     <vitro:displayRankAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#int">-1</vitro:displayRankAnnot>
@@ -2512,6 +2515,7 @@ display level 	</vitro:publicDescriptionAnnot>
     <vitro:selectFromExistingAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#boolean">false</vitro:selectFromExistingAnnot>
   </rdf:Description>
   <rdf:Description rdf:about="http://vivoweb.org/ontology/core#PresenterRole">
+    <vitro:customShortViewAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">presenterRoleShortView.jsp</vitro:customShortViewAnnot>
     <vitro:displayLimitAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#int">-1</vitro:displayLimitAnnot>
     <vitro:displayRankAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#int">-1</vitro:displayRankAnnot>
     <vitro:hiddenFromDisplayBelowRoleLevelAnnot rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/role#public"/>
@@ -4219,7 +4223,7 @@ display level 	</vitro:publicDescriptionAnnot>
     <vitro:displayRankAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#int">50</vitro:displayRankAnnot>
   </rdf:Description>
   <rdf:Description rdf:about="http://vivoweb.org/ontology/core#CoPrincipalInvestigatorRole">
-    <vitro:customShortViewAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">grantRoleShortView.jsp</vitro:customShortViewAnnot>
+    <vitro:customShortViewAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">grantCoPiRoleShortView.jsp</vitro:customShortViewAnnot>
     <vitro:displayLimitAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#int">-1</vitro:displayLimitAnnot>
     <vitro:displayRankAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#int">-1</vitro:displayRankAnnot>
     <vitro:hiddenFromDisplayBelowRoleLevelAnnot rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/role#public"/>
diff --git a/productMods/templates/entity/activityShortView.jsp b/productMods/templates/entity/activityShortView.jsp
deleted file mode 100644
index 4df65ec6..00000000
--- a/productMods/templates/entity/activityShortView.jsp
+++ /dev/null
@@ -1,94 +0,0 @@
-<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
-
-<%-- Custom short view for ResearchActivity, TeachingActivity, OutreachActivity, and ServiceActivity
-
-    SUBJECT - entity
-    PREDICATE - predicateUri
-    OBJECT - individual
-    
---%>
-
-<%@ page import="edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary" %>
-
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
-<%@ taglib uri="http://vitro.mannlib.cornell.edu/vitro/tags/StringProcessorTag" prefix="p" %>
-
-<c:set var="vivoCore" value="http://vivoweb.org/ontology/core#" />
-<c:set var="rdfs" value="<%= VitroVocabulary.RDFS %>" />
-<c:set var="labelUri" value="${rdfs}label" />
-
-<c:set var="researchActivityUri" value="${vivoCore}hasResearchActivity" />
-<c:set var="teachingActivityUri" value="${vivoCore}hasTeachingActivity" />
-<c:set var="serviceActivityUri" value="${vivoCore}professionalServiceActivity" />
-<c:set var="outreachActivityUri" value="${vivoCore}hasOutreachActivity" />
-
-<c:set var="predicateIsActivity" value="${predicateUri == researchActivityUri || 
-                                          predicateUri == teachingActivityUri || 
-                                          predicateUri == serviceActivityUri ||
-                                          predicateUri == outreachActivityUri}" />
-
-<c:choose>
-    <c:when test="${!empty individual}"><%-- individual is the OBJECT of the property referenced - in this case, the Activity object --%>
-        <c:choose>  
-            <c:when test="${!empty predicateUri}">
-                
-                <c:set var="activity" value="${individual}" />
-                <%-- Get the Activity label --%>
-                <c:set var="activityLabel" value=" ${activity.name}"/>
-                <%-- Create an html link element to the activity --%>
-                <c:url var="activityUrl" value="/individual"><c:param name="uri" value="${activity.URI}"/></c:url>
-                <c:set var="activityLink" ><a href='${activityUrl}'><p:process>${activityLabel}</p:process></a></c:set>
-                <c:if test="${!empty activityLink}" >
-                    <c:set var="activityLink" value="<strong>${activityLink}</strong> " />
-                </c:if> 
-
-                               
-                <%-- Get the role of the person in the activity --%>
-                <c:set var="role" value="${activity.dataPropertyMap['http://vivoweb.org/ontology/core#role'].dataPropertyStatements[0].data}"/>
-                    
-                <%-- Get the time span of the service activity --%>
-                <c:set var="startYearMonth" value="${activity.dataPropertyMap['http://vivoweb.org/ontology/core#startYearMonth'].dataPropertyStatements[0].data}"/>
-                <c:set var="endYearMonth" value="${activity.dataPropertyMap['http://vivoweb.org/ontology/core#endYearMonth'].dataPropertyStatements[0].data}"/>
-                <c:set var="timeSpan" value="" />
-                <c:if test="${!empty startYearMonth || !empty endYearMonth}" >
-                    <c:if test="${!empty startYearMonth}" >
-                        <c:set var="start" value="${fn:split(startYearMonth, '-')}" />
-                        <c:set var="startDate" value="${start[1]}/${start[0]}" />  
-                        <c:set var="timeSpan" value="${startDate}" />                  
-                    </c:if>
-                    <c:set var="timeSpan" value="${timeSpan} - " />
-                    <c:if test="${!empty endYearMonth}">
-                        <c:set var="end" value="${fn:split(endYearMonth, '-')}" />
-                        <c:set var="endDate" value="${end[1]}/${end[0]}" /> 
-                        <c:set var="timeSpan" value="${timeSpan}${endDate}" />                       
-                    </c:if>
-                </c:if>
-
-                <%-- Construct the final output --%>   
-                <p:process>${activityLink} </p:process> 
-                
-                <%-- We need a join but we have to keep getting variables in and out of JSTL/EL/Java. Do this for now even though it's ugly. --%>
-                <c:choose>                
-                    <c:when test="${!empty role && !empty timeSpan}">
-                        <p:process>${role}, ${timeSpan}</p:process>
-                    </c:when>   
-                    <c:when test="${!empty role}">
-                        <p:process>${role}</p:process>
-                    </c:when>  
-                    <c:when test="${!empty timeSpan}">
-                        <p:process>${timeSpan}</p:process>
-                    </c:when>
-                </c:choose>         
-            </c:when>
-            
-            <c:otherwise> <%-- no predicate --%>
-                <c:out value="No predicate available for custom rendering ..."/>
-            </c:otherwise>
-        </c:choose>
-    </c:when>
-    
-    <c:otherwise> <%-- no object --%>
-        <c:out value="Got nothing to draw here ..."/>
-    </c:otherwise>
-</c:choose>
diff --git a/productMods/templates/entity/clinicalActivityRoleView.jsp b/productMods/templates/entity/clinicalRoleShortView.jsp
similarity index 100%
rename from productMods/templates/entity/clinicalActivityRoleView.jsp
rename to productMods/templates/entity/clinicalRoleShortView.jsp
diff --git a/productMods/templates/entity/grantCopiRoleShortView.jsp b/productMods/templates/entity/grantCoPiRoleShortView.jsp
similarity index 100%
rename from productMods/templates/entity/grantCopiRoleShortView.jsp
rename to productMods/templates/entity/grantCoPiRoleShortView.jsp
diff --git a/productMods/templates/entity/researchActivityRoleShortView.jsp b/productMods/templates/entity/researcherRoleShortView.jsp
similarity index 100%
rename from productMods/templates/entity/researchActivityRoleShortView.jsp
rename to productMods/templates/entity/researcherRoleShortView.jsp
diff --git a/productMods/templates/entity/teachingActivityRoleShortView.jsp b/productMods/templates/entity/teacherRoleShortView.jsp
similarity index 100%
rename from productMods/templates/entity/teachingActivityRoleShortView.jsp
rename to productMods/templates/entity/teacherRoleShortView.jsp