diff --git a/src/arpeng/app/templates/CreeDictionary/components/definition__elaboration.html b/src/arpeng/app/templates/morphodict/components/definition__elaboration.html
similarity index 100%
rename from src/arpeng/app/templates/CreeDictionary/components/definition__elaboration.html
rename to src/arpeng/app/templates/morphodict/components/definition__elaboration.html
diff --git a/src/crkeng/app/templates/morphodict/index.html b/src/crkeng/app/templates/morphodict/index.html
index f3c5fbbf8..bc5955654 100644
--- a/src/crkeng/app/templates/morphodict/index.html
+++ b/src/crkeng/app/templates/morphodict/index.html
@@ -1,7 +1,7 @@
 {% extends 'morphodict/base.html' %}
 
 {% load static %}
-{% load creedictionary_extras %}
+{% load morphodict_extras %}
 {% load morphodict_orth %}
 
 {% block prose %}
diff --git a/src/morphodict/frontend/templates/morphodict/components/citations.html b/src/morphodict/frontend/templates/morphodict/components/citations.html
index 322a5c20a..d2c8afb51 100644
--- a/src/morphodict/frontend/templates/morphodict/components/citations.html
+++ b/src/morphodict/frontend/templates/morphodict/components/citations.html
@@ -20,7 +20,7 @@
       [ Wolvengrey, Arok, editor. /Cree: Words/. 2001. ]
   {% endcomment %}
 
-  {% load creedictionary_extras %}
+  {% load morphodict_extras %}
 
   {% for source in dictionary_sources|sort_sources %}
     {% with id=request|unique_id %}
diff --git a/src/morphodict/frontend/templates/morphodict/components/definition__elaboration--verbose.html b/src/morphodict/frontend/templates/morphodict/components/definition__elaboration--verbose.html
index 1c17b8187..4f648e038 100644
--- a/src/morphodict/frontend/templates/morphodict/components/definition__elaboration--verbose.html
+++ b/src/morphodict/frontend/templates/morphodict/components/definition__elaboration--verbose.html
@@ -21,7 +21,7 @@
 
   {% endcomment %}
 
-  {% load creedictionary_extras %}
+  {% load morphodict_extras %}
 
 {#  {% if ic_short %}#}
     <p class="elaboration__row elaboration__ic-row">
diff --git a/src/morphodict/frontend/templates/morphodict/components/definition__elaboration.html b/src/morphodict/frontend/templates/morphodict/components/definition__elaboration.html
index 5d7a87493..f1daaa8fd 100644
--- a/src/morphodict/frontend/templates/morphodict/components/definition__elaboration.html
+++ b/src/morphodict/frontend/templates/morphodict/components/definition__elaboration.html
@@ -27,7 +27,7 @@
 
   {% endcomment %}
 
-    {% load creedictionary_extras %}
+    {% load morphodict_extras %}
     {% load relabelling %}
     {% load morphodict_orth %}
 
diff --git a/src/morphodict/frontend/templates/morphodict/components/lexical-info.html b/src/morphodict/frontend/templates/morphodict/components/lexical-info.html
index 84339f414..8f6f98b53 100644
--- a/src/morphodict/frontend/templates/morphodict/components/lexical-info.html
+++ b/src/morphodict/frontend/templates/morphodict/components/lexical-info.html
@@ -17,7 +17,7 @@
 
   {% endcomment %}
 
-  {% load creedictionary_extras %}
+  {% load morphodict_extras %}
   {% load morphodict_orth %}
   {% load static %}
 
diff --git a/src/morphodict/frontend/templates/morphodict/components/paradigm.html b/src/morphodict/frontend/templates/morphodict/components/paradigm.html
index 95f7ec1a0..f9c8ce1b3 100644
--- a/src/morphodict/frontend/templates/morphodict/components/paradigm.html
+++ b/src/morphodict/frontend/templates/morphodict/components/paradigm.html
@@ -20,7 +20,7 @@
   {% endcomment %}
 
     {% load morphodict_orth %}
-    {% load creedictionary_extras %}
+    {% load morphodict_extras %}
     {% load relabelling %}
 
     <section class="definition__paradigm paradigm js-replaceable-paradigm" data-cy="paradigm">
diff --git a/src/morphodict/frontend/templates/morphodict/fst-tool.html b/src/morphodict/frontend/templates/morphodict/fst-tool.html
index 3da2ddee4..f3b1b9842 100644
--- a/src/morphodict/frontend/templates/morphodict/fst-tool.html
+++ b/src/morphodict/frontend/templates/morphodict/fst-tool.html
@@ -1,6 +1,6 @@
 {% extends 'morphodict/base.html' %}
 <!-- -->
-{% load creedictionary_extras %}
+{% load morphodict_extras %}
 <!-- -->
 {% block prose %}
 <section id="query-help" class="prose box box--spaced">
diff --git a/src/morphodict/frontend/templates/morphodict/legend.html b/src/morphodict/frontend/templates/morphodict/legend.html
index e1108b53c..db390c1c8 100644
--- a/src/morphodict/frontend/templates/morphodict/legend.html
+++ b/src/morphodict/frontend/templates/morphodict/legend.html
@@ -1,6 +1,6 @@
 {% extends 'morphodict/base.html' %}
 
-{% load creedictionary_extras %}
+{% load morphodict_extras %}
 {% load morphodict_orth %}
 
 {% block prose %}
diff --git a/src/morphodict/frontend/templates/morphodict/query-help.html b/src/morphodict/frontend/templates/morphodict/query-help.html
index 31a38fb0e..55f8b692e 100644
--- a/src/morphodict/frontend/templates/morphodict/query-help.html
+++ b/src/morphodict/frontend/templates/morphodict/query-help.html
@@ -1,6 +1,6 @@
 {% extends 'morphodict/base.html' %}
 <!-- -->
-{% load creedictionary_extras %}
+{% load morphodict_extras %}
 <!-- -->
 {% block prose %}
 <section id="query-help" class="prose box box--spaced">
diff --git a/src/morphodict/frontend/templatetags/creedictionary_extras.py b/src/morphodict/frontend/templatetags/morphodict_extras.py
similarity index 100%
rename from src/morphodict/frontend/templatetags/creedictionary_extras.py
rename to src/morphodict/frontend/templatetags/morphodict_extras.py
diff --git a/src/morphodict/lexicon/templates/morphodict/index.html b/src/morphodict/lexicon/templates/morphodict/index.html
index fa7e9d93c..63ed87586 100644
--- a/src/morphodict/lexicon/templates/morphodict/index.html
+++ b/src/morphodict/lexicon/templates/morphodict/index.html
@@ -1,7 +1,7 @@
 {% extends 'morphodict/base.html' %}
 
 {% load static %}
-{% load creedictionary_extras %}
+{% load morphodict_extras %}
 {% load morphodict_orth %}
 
 {% block prose %}
diff --git a/src/morphodict/tests/test_creedictionary_extras.py b/src/morphodict/tests/test_morphodict_extras.py
similarity index 100%
rename from src/morphodict/tests/test_creedictionary_extras.py
rename to src/morphodict/tests/test_morphodict_extras.py