diff --git a/README.rst b/README.rst
index 9e9f0f4a..db8335f1 100644
--- a/README.rst
+++ b/README.rst
@@ -26,9 +26,9 @@ Python projects on your system, create the virtualenv and activate it. Then run
 ``ui/bin/install-reqs`` to install the dependencies for this project into your
 Python environment.
 
-You'll need to create a ``tcmui/settings/local.py`` file with some details of
-your local configuration. See ``tcmui/settings/local.sample.py`` for a sample
-that can be copied to ``tcmui/settings/local.py`` and modified.
+You'll need to create a ``ccui/settings/local.py`` file with some details of
+your local configuration. See ``ccui/settings/local.sample.py`` for a sample
+that can be copied to ``ccui/settings/local.py`` and modified.
 
 Two settings are required:
 
diff --git a/bin/test b/bin/test
index 51671bc1..31d2e7a4 100755
--- a/bin/test
+++ b/bin/test
@@ -31,23 +31,23 @@ def main(basedir, cover_all=False):
         ]
     report_kw = {"directory": os.path.join(basedir, "coverage")}
     if cover_all:
-        # include all python modules under tcmui in report, including even those
+        # include all python modules under ccui in report, including even those
         # the tests don't cause to be imported at all yet, so as to get a more
         # accurate overall coverage figure.
         py_files = include
-        for dirpath, dirs, filenames in os.walk(os.path.join(basedir, "tcmui")):
+        for dirpath, dirs, filenames in os.walk(os.path.join(basedir, "ccui")):
             py_files.extend([os.path.join(dirpath, fn)
                              for fn in filenames if fn.endswith(".py")])
         report_kw["morfs"] = py_files
         report_kw["omit"] = [
-            "tcmui/compressor_filters.py",
+            "ccui/compressor_filters.py",
             # non-default settings files aren't exercised in tests
-            "tcmui/settings.py",
-            "tcmui/settings_local.py",
-            "tcmui/settings_local.sample.py"
+            "ccui/settings.py",
+            "ccui/settings_local.py",
+            "ccui/settings_local.sample.py"
             ]
     else:
-        report_kw["include"] = include + [os.path.join(basedir, "tcmui/*")]
+        report_kw["include"] = include + [os.path.join(basedir, "ccui/*")]
     cov.html_report(**report_kw)
 
     teardown_test_environment()
diff --git a/ccui/core/templatetags/tcmforms.py b/ccui/core/templatetags/ccforms.py
similarity index 100%
rename from ccui/core/templatetags/tcmforms.py
rename to ccui/core/templatetags/ccforms.py
diff --git a/requirements/dist b/requirements/dist
index 15a3724c..a10778e0 160000
--- a/requirements/dist
+++ b/requirements/dist
@@ -1 +1 @@
-Subproject commit 15a3724ca0c0318756ea23d2ef4db21f7150caeb
+Subproject commit a10778e0803cdd6a12b3779b445b5f524d7ee49e
diff --git a/templates/forms/_field.html b/templates/forms/_field.html
index 885e2980..f878eccf 100644
--- a/templates/forms/_field.html
+++ b/templates/forms/_field.html
@@ -1,4 +1,4 @@
-{% load tcmforms %}
+{% load ccforms %}
 {% if field|read_only %}
   <dl class="readonly">
     <dt>{{ field|label_text }}</dt>