diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b76c23..4ca5566 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Solspace Calendar Changelog
 
+## 2.0.8 - 2018-10-17
+### Fixed
+- Fixed a bug where the CP Events list page would not load because of an accidental reference to Freeform.
+
 ## 2.0.7 - 2018-10-17
 ### Added
 - Added `timezone` parameter for `calendar.export` function, allowing users to simulate a localized timezone, more-so as a workaround for Google Calendar not correctly supporting floating timezones.
diff --git a/composer.json b/composer.json
index 40296de..d5faf7e 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "solspace/craft3-calendar",
   "description": "The most powerful event management plugin for Craft.",
-  "version": "2.0.7",
+  "version": "2.0.8",
   "type": "craft-plugin",
   "minimum-stability": "dev",
   "authors": [
diff --git a/src/Controllers/SettingsController.php b/src/Controllers/SettingsController.php
index d8c9bdc..2a5020b 100644
--- a/src/Controllers/SettingsController.php
+++ b/src/Controllers/SettingsController.php
@@ -149,7 +149,7 @@ public function actionSaveSettings(): Response
 
     /**
      * Determines which template has to be rendered based on $template
-     * Adds a Freeform_SettingsModel to template variables
+     * Adds a Calendar_SettingsModel to template variables
      *
      * @param string $template
      * @param array  $variables
diff --git a/src/Resources/js/src/event-index.js b/src/Resources/js/src/event-index.js
index d4e9f8a..360500d 100644
--- a/src/Resources/js/src/event-index.js
+++ b/src/Resources/js/src/event-index.js
@@ -1 +1 @@
-"use strict";Craft.EventIndex=Craft.BaseElementIndex.extend({buttonGroup:null,init:function(t,e,n){this.on("selectSource",$.proxy(this,"updateButton")),this.on("selectSite",$.proxy(this,"updateButton")),this.base(t,e,n)},getDefaultSourceKey:function(){return this.base()},updateButton:function(){if(this.$source){this.resetMenuButton();var t=this.$source,e=t.data(),n=e.id,r=e.name,a=e.handle,i=e.key,o="*"===i,s=this.getValidSources().filter(function(t){return t.id!==n}),u=$("<div />",{"class":"btngroup submit"}),d=this.createMenuList(s),l=void 0,c=void 0,f="btn submit";o?(l=Craft.t("freeform","New Event"),f+=" menubtn"):(l=Craft.t("freeform","New {calendar} Event",{calendar:r}),f+=" add icon",c=this.getSourceUrl(a));var h=$("<a />",{"class":f,href:c,text:Craft.escapeHtml(l)}).appendTo(u);d.appendTo(u);var p=h;!o&&s.length>0&&(p=$("<div />",{"class":"btn submit menubtn"}).insertBefore(d)),new Garnish.MenuBtn(p),this.buttonGroup=u,this.addButton(this.buttonGroup)}},resetMenuButton:function(){this.buttonGroup&&this.buttonGroup.remove()},createMenuList:function(t){var e=$("<div />",{"class":"menu"}),n=$("<ul />").appendTo(e),r=!0,a=!1,i=void 0;try{for(var o,s=t[Symbol.iterator]();!(r=(o=s.next()).done);r=!0){var u=o.value,d=u.name,l=u.handle,c=u.color,f=$("<li />");$("<a />",{href:this.getSourceUrl(l),text:Craft.escapeHtml(d)}).prepend($("<span />",{"class":"color-indicator"}).css({backgroundColor:c})).appendTo(f),f.appendTo(n)}}catch(h){a=!0,i=h}finally{try{!r&&s["return"]&&s["return"]()}finally{if(a)throw i}}return e},getValidSources:function(){for(var t=this.$sources,e=[],n=0;n<t.length;n++){var r=$(t[n]),a=r.data(),i=a.key,o=a.id,s=a.handle,u=a.name,d=a.color,l=a.sites,c=void 0===l?"":l;if("*"!==i){var f=(""+c).split(",").map(function(t){return parseInt(t)});f.indexOf(this.siteId)!==-1&&e.push({key:i,id:o,handle:s,name:u,color:d})}}return e},getSourceUrl:function(t){var e=this,n=Craft.sites.find(function(t){return t.id===e.siteId}),r=n.handle;return Craft.getUrl("calendar/events/new/"+t+"/"+r)}}),Craft.registerElementIndexClass("Solspace\\Calendar\\Elements\\Event",Craft.EventIndex);
\ No newline at end of file
+"use strict";Craft.EventIndex=Craft.BaseElementIndex.extend({buttonGroup:null,init:function(t,e,n){this.on("selectSource",$.proxy(this,"updateButton")),this.on("selectSite",$.proxy(this,"updateButton")),this.base(t,e,n)},getDefaultSourceKey:function(){return this.base()},updateButton:function(){if(this.$source){this.resetMenuButton();var t=this.$source,e=t.data(),n=e.id,r=e.name,a=e.handle,i=e.key,s="*"===i,o=this.getValidSources().filter(function(t){return t.id!==n}),u=$("<div />",{"class":"btngroup submit"}),d=this.createMenuList(o),l=void 0,c=void 0,f="btn submit";s?(l=Craft.t("calendar","New Event"),f+=" menubtn"):(l=Craft.t("calendar","New {calendar} Event",{calendar:r}),f+=" add icon",c=this.getSourceUrl(a));var h=$("<a />",{"class":f,href:c,text:Craft.escapeHtml(l)}).appendTo(u);d.appendTo(u);var p=h;!s&&o.length>0&&(p=$("<div />",{"class":"btn submit menubtn"}).insertBefore(d)),new Garnish.MenuBtn(p),this.buttonGroup=u,this.addButton(this.buttonGroup)}},resetMenuButton:function(){this.buttonGroup&&this.buttonGroup.remove()},createMenuList:function(t){var e=$("<div />",{"class":"menu"}),n=$("<ul />").appendTo(e),r=!0,a=!1,i=void 0;try{for(var s,o=t[Symbol.iterator]();!(r=(s=o.next()).done);r=!0){var u=s.value,d=u.name,l=u.handle,c=u.color,f=$("<li />");$("<a />",{href:this.getSourceUrl(l),text:Craft.escapeHtml(d)}).prepend($("<span />",{"class":"color-indicator"}).css({backgroundColor:c})).appendTo(f),f.appendTo(n)}}catch(h){a=!0,i=h}finally{try{!r&&o["return"]&&o["return"]()}finally{if(a)throw i}}return e},getValidSources:function(){for(var t=this.$sources,e=[],n=0;n<t.length;n++){var r=$(t[n]),a=r.data(),i=a.key,s=a.id,o=a.handle,u=a.name,d=a.color,l=a.sites,c=void 0===l?"":l;if("*"!==i){var f=(""+c).split(",").map(function(t){return parseInt(t)});f.indexOf(this.siteId)!==-1&&e.push({key:i,id:s,handle:o,name:u,color:d})}}return e},getSourceUrl:function(t){var e=this,n=Craft.sites.find(function(t){return t.id===e.siteId}),r=n.handle;return Craft.getUrl("calendar/events/new/"+t+"/"+r)}}),Craft.registerElementIndexClass("Solspace\\Calendar\\Elements\\Event",Craft.EventIndex);
\ No newline at end of file
diff --git a/src/templates/events/_index.html b/src/templates/events/_index.html
index 461cfe2..e46086a 100644
--- a/src/templates/events/_index.html
+++ b/src/templates/events/_index.html
@@ -3,7 +3,7 @@
 {% set title = "Calendar: Events"|t('calendar') %}
 {% set selectedSubnavItem = 'events' %}
 
-{% do view.registerTranslations('freeform', [
+{% do view.registerTranslations('calendar', [
     'New Event',
     'New {calendar} Event',
 ]) %}
diff --git a/src/templates/layouts/_settings.html b/src/templates/layouts/_settings.html
index 56f0268..6c52bf2 100644
--- a/src/templates/layouts/_settings.html
+++ b/src/templates/layouts/_settings.html
@@ -18,7 +18,7 @@
 {% block actionButton %}
     <div class="buttons">
         <div class="btngroup submit">
-            <input type="submit" class="btn submit" value="{{ 'Save'|t('freeform') }}">
+            <input type="submit" class="btn submit" value="{{ 'Save'|t('calendar') }}">
         </div>
     </div>
 {% endblock %}