diff --git a/productMods/edit/forms/addClinicalRoleToPerson.jsp b/productMods/edit/forms/addClinicalRoleToPerson.jsp
index 2390270d..5eb41709 100644
--- a/productMods/edit/forms/addClinicalRoleToPerson.jsp
+++ b/productMods/edit/forms/addClinicalRoleToPerson.jsp
@@ -1,7 +1,8 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
 <jsp:include page="addRoleToPersonTwoStage.jsp">    
-	<jsp:param name="roleActivityTypeLabel" value="clinical activity" />
+	<jsp:param name="roleDescriptor" value="clinical activity" />
+	<jsp:param name="typeSelectorLabel" value="clinical activity type" />
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#ClinicalRole" />
 	<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
 	<jsp:param name="roleActivityType_objectClassUri" value="" /> 
diff --git a/productMods/edit/forms/addEditorRoleToPerson.jsp b/productMods/edit/forms/addEditorRoleToPerson.jsp
index d5c7842a..3d873084 100644
--- a/productMods/edit/forms/addEditorRoleToPerson.jsp
+++ b/productMods/edit/forms/addEditorRoleToPerson.jsp
@@ -1,11 +1,12 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
 <jsp:include page="addRoleToPersonTwoStage.jsp">    
-	<jsp:param name="roleActivityTypeLabel" value="editor for" />
+	<jsp:param name="roleDescriptor" value="editor role" />
+	<jsp:param name="typeSelectorLabel" value="editor role in" />
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#EditorRole" />	
     <jsp:param name="roleToActivityPredicate" value="http://vivoweb.org/ontology/core#forInformationResource" />
     <jsp:param name="activityToRolePredicate" value="http://vivoweb.org/ontology/core#linkedRole" />	
 	<jsp:param name="roleActivityType_optionsType" value="CHILD_VCLASSES" />
 	<jsp:param name="roleActivityType_objectClassUri" value="http://purl.org/ontology/bibo/Collection" /> 
-	<jsp:param name="roleActivityType_literalOptions" value="[ 'Select one' ]" />
+	<jsp:param name="roleActivityType_literalOptions" value="[ 'Select type' ]" />
 </jsp:include>
\ No newline at end of file
diff --git a/productMods/edit/forms/addHeadOfRoleToPerson.jsp b/productMods/edit/forms/addHeadOfRoleToPerson.jsp
index 89b67b13..db3cb930 100644
--- a/productMods/edit/forms/addHeadOfRoleToPerson.jsp
+++ b/productMods/edit/forms/addHeadOfRoleToPerson.jsp
@@ -1,13 +1,14 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
 <jsp:include page="addRoleToPersonTwoStage.jsp">    
-	<jsp:param name="roleActivityTypeLabel" value="head of" />
+	<jsp:param name="roleDescriptor" value="head of" />
+	<jsp:param name="typeSelectorLabel" value="head of" />
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#LeaderRole" />
 	<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
 	<jsp:param name="roleActivityType_objectClassUri" value="" />
 	 
 	<jsp:param name="roleActivityType_literalOptions" 
-    value='["", "Select one"],
+    value='["", "Select type"],
            [ "http://vivoweb.org/ontology/core#Association", "Association" ],
            [ "http://vivoweb.org/ontology/core#Center", "Center" ],
            [ "http://vivoweb.org/ontology/core#ClinicalOrganization", "Clinical Organization" ],
diff --git a/productMods/edit/forms/addMemberRoleToPerson.jsp b/productMods/edit/forms/addMemberRoleToPerson.jsp
index e1e79e7f..7e678d72 100644
--- a/productMods/edit/forms/addMemberRoleToPerson.jsp
+++ b/productMods/edit/forms/addMemberRoleToPerson.jsp
@@ -1,9 +1,10 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
 <jsp:include page="addRoleToPersonTwoStage.jsp">    
-	<jsp:param name="roleActivityTypeLabel" value="membership" />
+	<jsp:param name="roleDescriptor" value="membership" />
+    <jsp:param name="typeSelectorLabel" value="membership in" />
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#MemberRole" />
 	<jsp:param name="roleActivityType_optionsType" value="VCLASSGROUP" />
 	<jsp:param name="roleActivityType_objectClassUri" value="http://vivoweb.org/ontology#vitroClassGrouporganizations" /> 
-	<jsp:param name="roleActivityType_literalOptions" value="[ 'Select one' ]" />
+	<jsp:param name="roleActivityType_literalOptions" value="[ 'Select type' ]" />
 </jsp:include>
\ No newline at end of file
diff --git a/productMods/edit/forms/addOrganizerRoleToPerson.jsp b/productMods/edit/forms/addOrganizerRoleToPerson.jsp
index c9beec5c..8576efc8 100644
--- a/productMods/edit/forms/addOrganizerRoleToPerson.jsp
+++ b/productMods/edit/forms/addOrganizerRoleToPerson.jsp
@@ -1,12 +1,14 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
 <jsp:include page="addRoleToPersonTwoStage.jsp">    
-	<jsp:param name="roleActivityTypeLabel" value="organizer of" />
+	<jsp:param name="roleDescriptor" value="organizer of" />
+	<jsp:param name="typeSelectorLabel" value="organizer of" />
+	<jsp:param name="buttonText" value="organizer role" />
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#OrganizerRole" />	
 	<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
 	<jsp:param name="roleActivityType_objectClassUri" value="" /> 
 	<jsp:param name="roleActivityType_literalOptions" 
-    value='["", "Select one"],
+    value='["", "Select type"],
            [ "http://purl.org/NET/c4dm/event.owl#Event", "Event" ],
            [ "http://vivoweb.org/ontology/core#Competition", "Competition" ],
            [ "http://http://purl.org/ontology/bibo/Conference", "Conference" ],
diff --git a/productMods/edit/forms/addOutreachRoleToPerson.jsp b/productMods/edit/forms/addOutreachRoleToPerson.jsp
index 9e062b4e..b027cba4 100644
--- a/productMods/edit/forms/addOutreachRoleToPerson.jsp
+++ b/productMods/edit/forms/addOutreachRoleToPerson.jsp
@@ -1,12 +1,13 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
 <jsp:include page="addRoleToPersonTwoStage.jsp">    
-	<jsp:param name="roleActivityTypeLabel" value="outreach & community service" />
+	<jsp:param name="roleDescriptor" value="outreach & community service" />
+    <jsp:param name="typeSelectorLabel" value="outreach & community service in" />
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#OutreachProviderRole" />
 	<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
 	<jsp:param name="roleActivityType_objectClassUri" value="" /> 
 	<jsp:param name="roleActivityType_literalOptions" 
-    value='["", "Select one"],
+    value='["", "Select type"],
            [ "http://vivoweb.org/ontology/core#Association", "Association" ],
            [ "http://vivoweb.org/ontology/core#Center", "Center" ],
            [ "http://vivoweb.org/ontology/core#ClinicalOrganization", "Clinical Organization" ],
diff --git a/productMods/edit/forms/addPresenterRoleToPerson.jsp b/productMods/edit/forms/addPresenterRoleToPerson.jsp
index f34fb459..818c4d2a 100644
--- a/productMods/edit/forms/addPresenterRoleToPerson.jsp
+++ b/productMods/edit/forms/addPresenterRoleToPerson.jsp
@@ -2,8 +2,9 @@
 
 
 <jsp:include page="addRoleToPersonTwoStage.jsp">    
-	<jsp:param name="roleActivityTypeLabel" value="presentation" />
-	<jsp:param name="buttonLabel" value="presentation role" />
+	<jsp:param name="roleDescriptor" value="presentation" />
+    <jsp:param name="typeSelectorLabel" value="presentation type" />
+	<jsp:param name="buttonText" value="presentation role" />
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#PresenterRole" />
 	<jsp:param name="numDateFields" value="1" />
 	<jsp:param name="roleExamples" value="Moderator, Speaker, Panelist" />
diff --git a/productMods/edit/forms/addResearcherRoleToPerson.jsp b/productMods/edit/forms/addResearcherRoleToPerson.jsp
index 00096a0f..141b1805 100644
--- a/productMods/edit/forms/addResearcherRoleToPerson.jsp
+++ b/productMods/edit/forms/addResearcherRoleToPerson.jsp
@@ -1,7 +1,8 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
 <jsp:include page="addRoleToPersonTwoStage.jsp">    
-	<jsp:param name="roleActivityTypeLabel" value="research activity" />
+	<jsp:param name="roleDescriptor" value="research activity" />
+    <jsp:param name="typeSelectorLabel" value="research activity type" />
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#ResearcherRole" />
 	<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
 	<jsp:param name="roleActivityType_objectClassUri" value="" /> 
diff --git a/productMods/edit/forms/addReviewerRoleToPerson.jsp b/productMods/edit/forms/addReviewerRoleToPerson.jsp
index 302f9c66..a5631376 100644
--- a/productMods/edit/forms/addReviewerRoleToPerson.jsp
+++ b/productMods/edit/forms/addReviewerRoleToPerson.jsp
@@ -1,11 +1,13 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
 <jsp:include page="addRoleToPersonTwoStage.jsp">    
-	<jsp:param name="roleActivityTypeLabel" value="reviewer of" />
+	<jsp:param name="roleDescriptor" value="reviewer of" />
+    <jsp:param name="typeSelectorLabel" value="reviewer of" />	
+    <jsp:param name="buttonText" value="reviewer role" />
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#ReviewerRole" />	
     <jsp:param name="roleToActivityPredicate" value="http://vivoweb.org/ontology/core#forInformationResource" />
     <jsp:param name="activityToRolePredicate" value="http://vivoweb.org/ontology/core#linkedRole" />	
 	<jsp:param name="roleActivityType_optionsType" value="CHILD_VCLASSES" />
 	<jsp:param name="roleActivityType_objectClassUri" value="http://vivoweb.org/ontology/core#InformationResource" /> 
-	<jsp:param name="roleActivityType_literalOptions" value="[ 'Select one' ]" />
+	<jsp:param name="roleActivityType_literalOptions" value="[ 'Select type' ]" />
 </jsp:include>
\ No newline at end of file
diff --git a/productMods/edit/forms/addRoleToPersonTwoStage.jsp b/productMods/edit/forms/addRoleToPersonTwoStage.jsp
index 32738bf4..521c4b5d 100644
--- a/productMods/edit/forms/addRoleToPersonTwoStage.jsp
+++ b/productMods/edit/forms/addRoleToPersonTwoStage.jsp
@@ -58,35 +58,39 @@
 
 <%@ page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.Field"%>
 <%@ page import="edu.cornell.mannlib.vitro.webapp.edit.elements.DateTimeWithPrecision"%>
-<%@ page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.DateTimeIntervalValidation"%><c:set var="vivoOnt" value="http://vivoweb.org/ontology" />
+<%@ page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.DateTimeIntervalValidation"%>
 
 <%!
 public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.edit.forms.addRoleToPersonTwoStage.jsp");
 %>
 
-<c:set var="vivoCore" value="${vivoOnt}/core#" />
 
-<%--
-  These are the parameters that MUST be set of this form:
-     role type
-     predicate inverse          
-     role activity type label (should be singular)
-     super type of role types for roleActivityType select list generation
-     
-  These are optional parameters:
-     roleToActivityPredicate (default value is http://vivoweb.org/ontology/core#roleIn)
-     activityToRolePredicate (default value is http://vivoweb.org/ontology/core#relatedRole) 
---%>
+<%-- REQUIRED PARAMETERS --%>
 
-<c:set var="roleActivityTypeLabel">${param.roleActivityTypeLabel}</c:set>
-<c:set var="buttonLabel" scope="request">${! empty param.buttonLabel ? param.buttonLabel : param.roleActivityTypeLabel}</c:set>
-<c:set var="roleType">${param.roleType}</c:set>
+<c:set var="roleDescriptor">${param.roleDescriptor}</c:set> <%-- Used in textual references to the role --%>
+<c:set var="roleType">${param.roleType}</c:set> <%-- uri of role individual type --%>
+
+<%-- For creating the role activity type select list: --%>
 <c:set var="roleActivityType_optionsType" >${param.roleActivityType_optionsType}</c:set>
 <c:set var="roleActivityType_objectClassUri" >${param.roleActivityType_objectClassUri}</c:set> 
 <c:set var="roleActivityType_literalOptions" >${param.roleActivityType_literalOptions}</c:set>
+
+
+<%-- OPTIONAL PARAMETERS --%>
+
+<c:set var="typeSelectorLabel" scope="request"> <%-- label for type selector field --%>
+    ${! empty param.typeSelectorLabel ? param.typeSelectorLabel : param.roleDescriptor}
+</c:set>
+<c:set var="buttonText" scope="request">
+    ${! empty param.buttonText ? param.buttonText : param.roleDescriptor}
+</c:set>
+<c:set var="roleToActivityPredicate" scope="request">
+    ${! empty param.roleToActivityPredicate ? param.roleToActivityPredicate : "http://vivoweb.org/ontology/core#roleIn"}
+</c:set>
+<c:set var="activityToRolePredicate">
+    ${! empty param.activityToRolePredicate ? param.activityToRolePredicate : "http://vivoweb.org/ontology/core#relatedRole"}
+</c:set>
 <c:set var="numDateFields">${! empty param.numDateFields ? param.numDateFields : 2 }</c:set>
-<c:set var="roleToActivityPredicate" scope="request">${! empty param.roleToActivityPredicate ? param.roleToActivityPredicate : "http://vivoweb.org/ontology/core#roleIn"}</c:set>
-<c:set var="activityToRolePredicate">${! empty param.activityToRolePredicate ? param.activityToRolePredicate : "http://vivoweb.org/ontology/core#relatedRole"}</c:set>
 
 <%
     VitroRequest vreq = new VitroRequest(request);
@@ -106,9 +110,10 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
 
     vreq.setAttribute("gYearDatatypeUriJson", MiscWebUtils.escape(XSD.gYear.toString()));
     
-    vreq.setAttribute("roleActivityTitleCase", TitleCase.toTitleCase(vreq.getParameter("roleActivityTypeLabel")));
-    String buttonLabel = (String) vreq.getAttribute("buttonLabel");
-    vreq.setAttribute("buttonLabel", TitleCase.toTitleCase(buttonLabel));
+    vreq.setAttribute("typeSelectorLabelTitleCase", 
+            TitleCase.toTitleCase( (String)vreq.getAttribute("typeSelectorLabel"), false));
+    String buttonText = (String) vreq.getAttribute("buttonText");
+    vreq.setAttribute("buttonText", TitleCase.toTitleCase(buttonText));
     
     ObjectProperty op = wdf.getObjectPropertyDao().getObjectPropertyByURI( predicateUri ); 
     if( op != null &&  op.getURIInverse() != null ){
@@ -468,13 +473,13 @@ request.setAttribute("typeQuery", getActivityTypeQuery(vreq));
     <%-- Includes edit AND repair mode --%>
     <c:when test="<%= request.getAttribute(\"objectUri\")!=null %>">     	
         <c:set var="titleVerb" value="Edit" />        
-        <c:set var="submitButtonText" value="Edit ${buttonLabel}" />
+        <c:set var="submitButtonText" value="Edit ${buttonText}" />
         <c:set var="disabledVal">${editMode == "repair" ? "" : "disabled" }</c:set>
     </c:when>
     <c:otherwise>
         <c:set var="titleVerb" value="Create" />
         <c:set var="editMode" value="add" />
-        <c:set var="submitButtonText" value="${buttonLabel}" />
+        <c:set var="submitButtonText" value="${buttonText}" />
         <c:set var="disabledVal" value="" />
     </c:otherwise>
 </c:choose>
@@ -487,15 +492,15 @@ request.setAttribute("typeQuery", getActivityTypeQuery(vreq));
 
 <% if( mode == EditMode.ERROR ){ %>
  <div>This form is unable to handle the editing of this role because it is associated with 
-      multiple ${param.roleActivityTypeLabel} individuals.</div>      
+      multiple ${param.roleDescriptor} individuals.</div>      
 <% }else{ %>
 	
-	<h2>${titleVerb}&nbsp;${roleActivityTypeLabel} entry for <%= subjectName %></h2>
+	<h2>${titleVerb}&nbsp;${roleDescriptor} entry for <%= subjectName %></h2>
 	<%-- DO NOT CHANGE IDS, CLASSES, OR HTML STRUCTURE IN THIS FORM WITHOUT UNDERSTANDING THE IMPACT ON THE JAVASCRIPT! --%>
 	
 	<form id="addRoleForm" class="customForm" action="<c:url value="/edit/processRdfForm2.jsp"/>" >
 	
-	    <p class="inline"><v:input type="select" label="${roleActivityTitleCase} Type ${requiredHint}" name="roleActivityType" disabled="${disabledVal}" id="typeSelector" /></p>
+	    <p class="inline"><v:input type="select" label="${typeSelectorLabelTitleCase} ${requiredHint}" name="roleActivityType" disabled="${disabledVal}" id="typeSelector" /></p>
 	    
 	    <div class="fullViewOnly">
 	        
diff --git a/productMods/edit/forms/addServiceProviderRoleToPerson.jsp b/productMods/edit/forms/addServiceProviderRoleToPerson.jsp
index ccab85c6..f39a975a 100644
--- a/productMods/edit/forms/addServiceProviderRoleToPerson.jsp
+++ b/productMods/edit/forms/addServiceProviderRoleToPerson.jsp
@@ -1,13 +1,14 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
 <jsp:include page="addRoleToPersonTwoStage.jsp">    
-	<jsp:param name="roleActivityTypeLabel" value="service to the profession" />
+	<jsp:param name="roleDescriptor" value="service to the profession" />
+	<jsp:param name="typeSelectorLabel" value="service to the profession in" />
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#ServiceProviderRole" />
 	
 	<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
 	<jsp:param name="roleActivityType_objectClassUri" value="" /> 	
 	<jsp:param name="roleActivityType_literalOptions" 
-    value='["", "Select one"],
+    value='["", "Select type"],
            [ "http://vivoweb.org/ontology/core#Association", "Association" ],
            [ "http://vivoweb.org/ontology/core#Center", "Center" ],
            [ "http://vivoweb.org/ontology/core#ClinicalOrganization", "Clinical Organization" ],
diff --git a/productMods/edit/forms/addTeacherRoleToPerson.jsp b/productMods/edit/forms/addTeacherRoleToPerson.jsp
index 3ea87099..09375b8e 100644
--- a/productMods/edit/forms/addTeacherRoleToPerson.jsp
+++ b/productMods/edit/forms/addTeacherRoleToPerson.jsp
@@ -1,7 +1,8 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
 <jsp:include page="addRoleToPersonTwoStage.jsp">    
-	<jsp:param name="roleActivityTypeLabel" value="teaching activity" />
+	<jsp:param name="roleDescriptor" value="teaching activity" />
+	<jsp:param name="typeSelectorLabel" value="teaching activity type" />
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#TeacherRole" />
 	<jsp:param name="roleExamples" value="Instructor, Facilitator, Assistant" />
 	<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
diff --git a/productMods/edit/forms/js/customFormWithAutocomplete.js b/productMods/edit/forms/js/customFormWithAutocomplete.js
index 91ae75c1..597388b0 100644
--- a/productMods/edit/forms/js/customFormWithAutocomplete.js
+++ b/productMods/edit/forms/js/customFormWithAutocomplete.js
@@ -456,7 +456,7 @@ var customForm = {
     getTypeNameForLabels: function() {
         // If this.acType is empty, we are either in a one-step form with no type yet selected,
         // or in repair mode in a two-step form with no type selected. Use the default type
-        // name specified in the form data (this.typeName is 'Select one').
+        // name specified in the form data.
         return this.acType ? this.typeName : this.capitalize(this.defaultTypeName);
     },