diff --git a/wagtail/wagtailadmin/static/wagtailadmin/css/panels/rich-text.less b/wagtail/wagtailadmin/static/wagtailadmin/css/panels/rich-text.less
index 4c2c5f7be..13528b46a 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/css/panels/rich-text.less
+++ b/wagtail/wagtailadmin/static/wagtailadmin/css/panels/rich-text.less
@@ -14,7 +14,7 @@
     min-height:50px;
     overflow: hidden;
 
-    /* Resetting various html tags that have been messed with by Verdant's main css */
+    /* Resetting various html tags that have been messed with by Wagtail's main css */
     h1{
         text-transform:none;
     }
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/hallo-plugins/hallo-verdant-toolbar.js b/wagtail/wagtailadmin/static/wagtailadmin/js/hallo-plugins/hallo-wagtail-toolbar.js
similarity index 100%
rename from wagtail/wagtailadmin/static/wagtailadmin/js/hallo-plugins/hallo-verdant-toolbar.js
rename to wagtail/wagtailadmin/static/wagtailadmin/js/hallo-plugins/hallo-wagtail-toolbar.js
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/hallo-plugins/hallo-verdantlink.coffee b/wagtail/wagtailadmin/static/wagtailadmin/js/hallo-plugins/hallo-wagtaillink.coffee
similarity index 96%
rename from wagtail/wagtailadmin/static/wagtailadmin/js/hallo-plugins/hallo-verdantlink.coffee
rename to wagtail/wagtailadmin/static/wagtailadmin/js/hallo-plugins/hallo-wagtaillink.coffee
index ef7963690..7f5705065 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/hallo-plugins/hallo-verdantlink.coffee
+++ b/wagtail/wagtailadmin/static/wagtailadmin/js/hallo-plugins/hallo-wagtaillink.coffee
@@ -1,7 +1,7 @@
-# plugin for hallo.js to allow inserting links using Verdant's page chooser
+# plugin for hallo.js to allow inserting links using Wagtail's page chooser
 
 (($) ->
-    $.widget "IKS.halloverdantlink",
+    $.widget "IKS.hallowagtaillink",
         options:
             uuid: ''
             editable: null
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
index 3af65aae2..8e6027304 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
+++ b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
@@ -25,10 +25,10 @@ function makeRichTextEditable(id) {
             'hallolists': {},
             'hallohr': {},
             'halloreundo': {},
-            'halloverdantimage': {},
-            'halloverdantembeds': {},
-            'halloverdantlink': {},
-            'halloverdantdoclink': {},
+            'hallowagtailimage': {},
+            'hallowagtailembeds': {},
+            'hallowagtaillink': {},
+            'hallowagtaildoclink': {},
         }
     }).bind('hallomodified', function(event, data) {
         input.val(data.content);
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html
index 15bb26589..5b38a05fc 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html
@@ -10,17 +10,17 @@
     <script src="{{ STATIC_URL }}wagtailadmin/js/vendor/tag-it.js"></script>
     <script src="{{ STATIC_URL }}wagtailadmin/js/expanding_formset.js"></script>
     <script src="{{ STATIC_URL }}wagtailadmin/js/modal-workflow.js"></script>
-    <script src="{{ STATIC_URL }}wagtailadmin/js/hallo-plugins/hallo-verdant-toolbar.js"></script>
-    <script type="text/coffeescript" src="{{ STATIC_URL }}wagtailadmin/js/hallo-plugins/hallo-verdantlink.coffee"></script>
+    <script src="{{ STATIC_URL }}wagtailadmin/js/hallo-plugins/hallo-wagtail-toolbar.js"></script>
+    <script type="text/coffeescript" src="{{ STATIC_URL }}wagtailadmin/js/hallo-plugins/hallo-wagtaillink.coffee"></script>
     <script type="text/coffeescript" src="{{ STATIC_URL }}wagtailadmin/js/hallo-plugins/hallo-hr.coffee"></script>
-    <script type="text/coffeescript" src="{{ STATIC_URL }}wagtailimages/js/hallo-plugins/hallo-verdantimage.coffee"></script>
-    <script type="text/coffeescript" src="{{ STATIC_URL }}wagtailembeds/js/hallo-plugins/hallo-verdantembeds.coffee"></script>
-    <script type="text/coffeescript" src="{{ STATIC_URL }}wagtaildocs/js/hallo-plugins/hallo-verdantdoclink.coffee"></script>
+    <script type="text/coffeescript" src="{{ STATIC_URL }}wagtailimages/js/hallo-plugins/hallo-wagtailimage.coffee"></script>
+    <script type="text/coffeescript" src="{{ STATIC_URL }}wagtailembeds/js/hallo-plugins/hallo-wagtailembeds.coffee"></script>
+    <script type="text/coffeescript" src="{{ STATIC_URL }}wagtaildocs/js/hallo-plugins/hallo-wagtaildoclink.coffee"></script>
     <script src="{{ STATIC_URL }}wagtailadmin/js/page-editor.js"></script>
 
     <script src="{{ STATIC_URL }}wagtailadmin/js/page-chooser.js"></script>
     {% comment %}
-        TODO: have a mechanism to specify image-chooser.js (and hallo-verdantimage.coffee)
+        TODO: have a mechanism to specify image-chooser.js (and hallo-wagtailimage.coffee)
         within the wagtailimages app -
         ideally wagtailadmin shouldn't have to know anything at all about wagtailimages
         TODO: a method of injecting these sorts of things on demand when the modal is spawned.
diff --git a/wagtail/wagtaildocs/static/wagtaildocs/js/hallo-plugins/hallo-verdantdoclink.coffee b/wagtail/wagtaildocs/static/wagtaildocs/js/hallo-plugins/hallo-wagtaildoclink.coffee
similarity index 94%
rename from wagtail/wagtaildocs/static/wagtaildocs/js/hallo-plugins/hallo-verdantdoclink.coffee
rename to wagtail/wagtaildocs/static/wagtaildocs/js/hallo-plugins/hallo-wagtaildoclink.coffee
index fe1b505f2..180190cbd 100644
--- a/wagtail/wagtaildocs/static/wagtaildocs/js/hallo-plugins/hallo-verdantdoclink.coffee
+++ b/wagtail/wagtaildocs/static/wagtaildocs/js/hallo-plugins/hallo-wagtaildoclink.coffee
@@ -1,7 +1,7 @@
-# plugin for hallo.js to allow inserting links using Verdant's page chooser
+# plugin for hallo.js to allow inserting links using Wagtail's page chooser
 
 (($) ->
-    $.widget "IKS.halloverdantdoclink",
+    $.widget "IKS.hallowagtaildoclink",
         options:
             uuid: ''
             editable: null
diff --git a/wagtail/wagtailembeds/static/wagtailembeds/js/hallo-plugins/hallo-verdantembeds.coffee b/wagtail/wagtailembeds/static/wagtailembeds/js/hallo-plugins/hallo-wagtailembeds.coffee
similarity index 97%
rename from wagtail/wagtailembeds/static/wagtailembeds/js/hallo-plugins/hallo-verdantembeds.coffee
rename to wagtail/wagtailembeds/static/wagtailembeds/js/hallo-plugins/hallo-wagtailembeds.coffee
index 841be3a74..9ce0cf58c 100644
--- a/wagtail/wagtailembeds/static/wagtailembeds/js/hallo-plugins/hallo-verdantembeds.coffee
+++ b/wagtail/wagtailembeds/static/wagtailembeds/js/hallo-plugins/hallo-wagtailembeds.coffee
@@ -1,7 +1,7 @@
 # plugin for hallo.js to allow inserting embeds
 
 (($) ->
-    $.widget "IKS.halloverdantembeds",
+    $.widget "IKS.hallowagtailembeds",
         options:
             uuid: ''
             editable: null
diff --git a/wagtail/wagtailimages/static/wagtailimages/js/hallo-plugins/hallo-verdantimage.coffee b/wagtail/wagtailimages/static/wagtailimages/js/hallo-plugins/hallo-wagtailimage.coffee
similarity index 92%
rename from wagtail/wagtailimages/static/wagtailimages/js/hallo-plugins/hallo-verdantimage.coffee
rename to wagtail/wagtailimages/static/wagtailimages/js/hallo-plugins/hallo-wagtailimage.coffee
index 57f097867..ab5e8a7ed 100644
--- a/wagtail/wagtailimages/static/wagtailimages/js/hallo-plugins/hallo-verdantimage.coffee
+++ b/wagtail/wagtailimages/static/wagtailimages/js/hallo-plugins/hallo-wagtailimage.coffee
@@ -1,7 +1,7 @@
-# plugin for hallo.js to allow inserting images from the Verdant image library
+# plugin for hallo.js to allow inserting images from the Wagtail image library
 
 (($) ->
-    $.widget "IKS.halloverdantimage",
+    $.widget "IKS.hallowagtailimage",
         options:
             uuid: ''
             editable: null