diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java
index 9cb721ff5..3749035ad 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java
@@ -53,7 +53,7 @@ public class DatapropEditController extends BaseEditController {
         PropertyGroupDao pgDao = getWebappDaoFactory().getPropertyGroupDao();
 
         ArrayList results = new ArrayList();
-        results.add("Datatype Property");
+        results.add("Data Property");
         results.add("ontology");
         results.add("display name");
         results.add("domain");
@@ -180,7 +180,7 @@ public class DatapropEditController extends BaseEditController {
         request.setAttribute("datatypeProperty", dp);
         request.setAttribute("bodyJsp","/templates/edit/specific/dataprops_edit.jsp");
         request.setAttribute("portalBean",portal);
-        request.setAttribute("title","Datatype Property Control Panel");
+        request.setAttribute("title","Data Property Control Panel");
         request.setAttribute("css", "<link rel=\"stylesheet\" type=\"text/css\" href=\""+portal.getThemeDir()+"css/edit.css\"/>");
 
         try {
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropRetryController.java
index 39ca7a16f..4b5e711c2 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropRetryController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropRetryController.java
@@ -182,7 +182,7 @@ public class DatapropRetryController extends BaseEditController {
         request.setAttribute("colspan","4");
         request.setAttribute("scripts","/templates/edit/formBasic.js");
         request.setAttribute("formJsp","/templates/edit/specific/dataprop_retry.jsp");
-        request.setAttribute("title","Datatype Property Editing Form");
+        request.setAttribute("title","Data Property Editing Form");
         request.setAttribute("_action",action);
         request.setAttribute("unqualifiedClassName","DatatypeProperty");
         setRequestAttributes(request,epo);
diff --git a/webapp/web/edit/forms/datapropStmtDelete.jsp b/webapp/web/edit/forms/datapropStmtDelete.jsp
index 0024c8c5d..3e2bdecf8 100644
--- a/webapp/web/edit/forms/datapropStmtDelete.jsp
+++ b/webapp/web/edit/forms/datapropStmtDelete.jsp
@@ -96,5 +96,5 @@
             <jsp:include page="${postForm}"/>
 <%      }
      } else {
-           throw new Error("In datapropStmtDelete.jsp, no match via hashcode to existing datatype property "+predicateUri+" for subject "+subject.getName()+"\n");
+           throw new Error("In datapropStmtDelete.jsp, no match via hashcode to existing data property "+predicateUri+" for subject "+subject.getName()+"\n");
      }%>
diff --git a/webapp/web/templates/edit/specific/dataprops_edit.jsp b/webapp/web/templates/edit/specific/dataprops_edit.jsp
index df896fd7e..0102833b1 100644
--- a/webapp/web/templates/edit/specific/dataprops_edit.jsp
+++ b/webapp/web/templates/edit/specific/dataprops_edit.jsp
@@ -25,11 +25,11 @@
 	<td>
         <form action="showDataPropertyHierarchy" method="get">
             <input type="hidden" name="home" value="${portalBean.portalId}" />
-            <input type="submit" class="form-button" value="Datatype Property Hierarchy"/>
+            <input type="submit" class="form-button" value="Data Property Hierarchy"/>
         </form>
 		<form action="listDatatypeProperties" method="get">
 			<input type="hidden" name="home" value="${portalBean.portalId}" />
-			<input type="submit" class="form-button" value="All Datatype Properties"/>
+			<input type="submit" class="form-button" value="All Data Properties"/>
 		</form>
         <form action="listDataPropertyStatements" method="get">
         	<input type="hidden" name="home" value="${portalBean.portalId}" />
@@ -44,14 +44,14 @@
 			<input type="hidden" name="home" value="${portalBean.portalId}" />
 			<input type="hidden" name="controller" value="Dataprop"/>
 			<input type="hidden" name="uri" value="${datatypeProperty.URI}"/>
-			<input type="submit" class="form-button" value="Edit This Datatype Property"/>
+			<input type="submit" class="form-button" value="Edit this Data Property"/>
 		</form>
 	</td>
 	<td valign="bottom">
 		<form action="editForm" method="get">
 			<input type="hidden" name="home" value="${portalBean.portalId}" />
 			<input type="hidden" name="controller" value="Dataprop"/>
-			<input type="submit" class="form-button" value="Add New Datatype Property"/>
+			<input type="submit" class="form-button" value="Add New Data Property"/>
 		</form>
 		<form action="editForm" method="get">
             <input type="submit" class="form-button" value="Change URI"/>