diff --git a/src/data/templates/view_family_detail.html b/src/data/templates/view_family_detail.html
index 400523f79..f69f0ce2a 100644
--- a/src/data/templates/view_family_detail.html
+++ b/src/data/templates/view_family_detail.html
@@ -98,7 +98,7 @@
   <ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
     <li class="ui-state-default ui-corner-top ui-tabs-selected ui-state-active"><a href="#tab-children">Children</a></li>
     <li class="ui-corner-top ui-state-default"><a href="#tab-events">Events</a></li>
-    <li class="ui-corner-top ui-state-default"><a href="#tab-sources">Sources</a></li>
+    <li class="ui-corner-top ui-state-default"><a href="#tab-citations">Citations</a></li>
     <li class="ui-corner-top ui-state-default"><a href="#tab-attributes">Attributes</a></li>
     <li class="ui-corner-top ui-state-default"><a href="#tab-notes">Notes</a></li>
     <li class="ui-corner-top ui-state-default"><a href="#tab-media">Media</a></li>
@@ -112,8 +112,8 @@
   <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-events">
     {% event_table family user action "/event/$act/family/%s" family.handle %}
   </div>
-  <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-sources">
-    {% source_table family user action "/source/$act/family/%s" family.handle %}
+  <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-citations">
+    {% citation_table family user action "/citation/$act/family/%s" family.handle %}
   </div>
   <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-attributes">
     {% attribute_table family user action "/attribute/add/family/%s" family.handle %}
diff --git a/src/data/templates/view_name_detail.html b/src/data/templates/view_name_detail.html
index b56d88b3c..82e2ef583 100644
--- a/src/data/templates/view_name_detail.html
+++ b/src/data/templates/view_name_detail.html
@@ -75,7 +75,7 @@
     <li class="ui-state-default ui-corner-top ui-tabs-selected ui-state-active"><a href="#tab-general">General</a></li>
     <li class="ui-corner-top ui-state-default"><a href="#tab-surnames">Surnames</a></li>
     <li class="ui-corner-top ui-state-default"><a href="#tab-names">Other Names</a></li>
-    <li class="ui-corner-top ui-state-default"><a href="#tab-sources">Sources</a></li>
+    <li class="ui-corner-top ui-state-default"><a href="#tab-citations">Citations</a></li>
     <li class="ui-corner-top ui-state-default"><a href="#tab-notes">Notes</a></li>
   </ul>
 
@@ -105,8 +105,8 @@
   <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-names">
     {% name_table person user action "/person/%s/name" person.handle %}
   </div>
-  <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-sources">
-    {% source_table nameform.model user action "/person/%s/name/%s/source" person.handle nameform.model.order %}
+  <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-citations">
+    {% citation_table nameform.model user action "/citation/add/person/%s/name/%s" person.handle nameform.model.order %}
   </div>
   <div class="ui-tabs-panel ui-widget-content ui-corner-bottom
 	      ui-tabs-hide" id="tab-notes">
diff --git a/src/data/templates/view_place_detail.html b/src/data/templates/view_place_detail.html
index bfdae9abf..558e41cdf 100644
--- a/src/data/templates/view_place_detail.html
+++ b/src/data/templates/view_place_detail.html
@@ -52,7 +52,7 @@
   <ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
     <li class="ui-state-default ui-corner-top ui-tabs-selected ui-state-active"><a href="#tab-locations">Location</a></li>
     <li class="ui-corner-top ui-state-default"><a href="#tab-alternatelocations">Alternate Locations</a></li>
-    <li class="ui-corner-top ui-state-default"><a href="#tab-sources">Sources</a></li>
+    <li class="ui-corner-top ui-state-default"><a href="#tab-citations">Citations</a></li>
     <li class="ui-corner-top ui-state-default"><a href="#tab-notes">Notes</a></li>
     <li class="ui-corner-top ui-state-default"><a href="#tab-media">Media</a></li>
     <li class="ui-corner-top ui-state-default"><a href="#tab-internet">Internet</a></li>
@@ -65,8 +65,8 @@
   <div class="ui-tab-panel ui-widget-content ui-corner-bottom ui-tab-hide" id="tab-alternatelocations">
     {% location_table place user action "/location/$act/place/%s" place.handle %}
   </div>
-  <div class="ui-tab-panel ui-widget-content ui-corner-bottom ui-tab-hide" id="tab-sources">
-    {% source_table place user action "/source/$act/place/%s" place.handle %}
+  <div class="ui-tab-panel ui-widget-content ui-corner-bottom ui-tab-hide" id="tab-citations">
+    {% citation_table place user action "/citation/$act/place/%s" place.handle %}
   </div>
   <div class="ui-tab-panel ui-widget-content ui-corner-bottom ui-tab-hide" id="tab-notes">
     {% note_table place user action "/note/$act/place/%s" place.handle %}