diff --git a/assets/javascripts/discourse/components/events-calendar.js.es6 b/assets/javascripts/discourse/components/upcoming-events-calendar.js.es6
similarity index 95%
rename from assets/javascripts/discourse/components/events-calendar.js.es6
rename to assets/javascripts/discourse/components/upcoming-events-calendar.js.es6
index a16a6f3f..78257685 100644
--- a/assets/javascripts/discourse/components/events-calendar.js.es6
+++ b/assets/javascripts/discourse/components/upcoming-events-calendar.js.es6
@@ -26,7 +26,7 @@ export default Component.extend({
     this._super(...arguments);
 
     this._loadCalendar().then(() => {
-      const calendarNode = document.getElementById("events-calendar");
+      const calendarNode = document.getElementById("upcoming-events-calendar");
 
       if (calendarNode) {
         this._calendar = new window.FullCalendar.Calendar(calendarNode, {});
diff --git a/assets/javascripts/discourse/templates/components/events-calendar.hbs b/assets/javascripts/discourse/templates/components/events-calendar.hbs
deleted file mode 100644
index 207feef1..00000000
--- a/assets/javascripts/discourse/templates/components/events-calendar.hbs
+++ /dev/null
@@ -1 +0,0 @@
-<div id="events-calendar"></div>
diff --git a/assets/javascripts/discourse/templates/components/upcoming-events-calendar.hbs b/assets/javascripts/discourse/templates/components/upcoming-events-calendar.hbs
new file mode 100644
index 00000000..7ae9ae1a
--- /dev/null
+++ b/assets/javascripts/discourse/templates/components/upcoming-events-calendar.hbs
@@ -0,0 +1 @@
+<div id="upcoming-events-calendar"></div>
diff --git a/assets/javascripts/discourse/templates/discourse-post-event-upcoming-events-index.hbs b/assets/javascripts/discourse/templates/discourse-post-event-upcoming-events-index.hbs
index 24c80cc3..057a4d2e 100644
--- a/assets/javascripts/discourse/templates/discourse-post-event-upcoming-events-index.hbs
+++ b/assets/javascripts/discourse/templates/discourse-post-event-upcoming-events-index.hbs
@@ -1,3 +1,3 @@
 <div class="discourse-post-event-upcoming-events">
-  {{events-calendar events=events}}
+  {{upcoming-events-calendar events=events}}
 </div>
diff --git a/assets/stylesheets/common/events-calendar.scss b/assets/stylesheets/common/upcoming-events-calendar.scss
similarity index 98%
rename from assets/stylesheets/common/events-calendar.scss
rename to assets/stylesheets/common/upcoming-events-calendar.scss
index 0f225337..9b994fa1 100644
--- a/assets/stylesheets/common/events-calendar.scss
+++ b/assets/stylesheets/common/upcoming-events-calendar.scss
@@ -1,4 +1,4 @@
-#events-calendar {
+#upcoming-events-calendar {
   &.fc-unthemed {
     tbody,
     thead,
diff --git a/plugin.rb b/plugin.rb
index fad35b1d..37b0058b 100644
--- a/plugin.rb
+++ b/plugin.rb
@@ -14,7 +14,7 @@ enabled_site_setting :calendar_enabled
 
 register_asset "stylesheets/vendor/fullcalendar.min.css"
 register_asset "stylesheets/common/discourse-calendar.scss"
-register_asset "stylesheets/common/events-calendar.scss"
+register_asset "stylesheets/common/upcoming-events-calendar.scss"
 register_asset "stylesheets/common/discourse-post-event.scss"
 register_asset "stylesheets/common/discourse-post-event-preview.scss"
 register_asset "stylesheets/common/discourse-post-event-builder.scss"