diff --git a/app/components/main-content.js b/app/components/monitor-content-height.js
similarity index 99%
rename from app/components/main-content.js
rename to app/components/monitor-content-height.js
index 95e7b7cd9e..44eb58c95a 100644
--- a/app/components/main-content.js
+++ b/app/components/monitor-content-height.js
@@ -5,6 +5,8 @@ import { task, timeout } from 'ember-concurrency';
 
 // Currently used to determine the height of list-views
 export default Component.extend({
+  tagName: '',
+
   /**
    * Layout service. We inject it to keep its `contentHeight` property
    * up-to-date.
diff --git a/app/services/layout.js b/app/services/layout.js
index ff20c4b08b..8e7fc94836 100644
--- a/app/services/layout.js
+++ b/app/services/layout.js
@@ -16,7 +16,7 @@ import Evented from '@ember/object/evented';
 export default Service.extend(Evented, {
   /**
    * Stores the app's content height. This property is kept up-to-date
-   * by the `main-content` component.
+   * by the `monitor-content-height` component.
    *
    * @property contentHeight
    * @type {Number}
@@ -24,7 +24,7 @@ export default Service.extend(Evented, {
   contentHeight: null,
 
   /**
-   * This is called by `main-content` whenever a window resize is detected
+   * This is called by `monitor-content-height` whenever a window resize is detected
    * and the app's content height has changed. We therefore update the
    * `contentHeight` property and notify all listeners (mostly lists).
    *
diff --git a/app/templates/application.hbs b/app/templates/application.hbs
index f8e9af866a..08d30a344f 100644
--- a/app/templates/application.hbs
+++ b/app/templates/application.hbs
@@ -37,9 +37,9 @@
               </button>
             </div>
 
-            <MainContent class="split__panel__bd">
+            <MonitorContentHeight class="split__panel__bd">
               {{outlet}}
-            </MainContent>
+            </MonitorContentHeight>
           </div>
         </div>
       </div>
diff --git a/app/templates/components/main-content.hbs b/app/templates/components/monitor-content-height.hbs
similarity index 100%
rename from app/templates/components/main-content.hbs
rename to app/templates/components/monitor-content-height.hbs