diff --git a/cms/static/js/base.js b/cms/static/js/base.js
index 71dbbd388e..907e01e3d3 100644
--- a/cms/static/js/base.js
+++ b/cms/static/js/base.js
@@ -62,7 +62,7 @@ $(document).ready(function() {
     });
 
     // Subsection reordering
-    $('.unit-list ol').sortable({
+    $('.subsection-list > ol').sortable({
         axis: 'y',
         handle: '.section-item .drag-handle',
         update: onSubsectionReordered
diff --git a/cms/static/sass/_courseware.scss b/cms/static/sass/_courseware.scss
index 15b7882069..752c33346f 100644
--- a/cms/static/sass/_courseware.scss
+++ b/cms/static/sass/_courseware.scss
@@ -38,8 +38,8 @@ input.courseware-unit-search-input {
 		}
 	}
 
-	&.collapsed .unit-list,
-	.collapsed .unit-list,
+	&.collapsed .subsection-list,
+	.collapsed .subsection-list,
 	.collapsed > ol {
 		display: none !important;
 	}
@@ -94,7 +94,7 @@ input.courseware-unit-search-input {
 		border-radius: 3px 3px 0 0;
 	}
 
-	.unit-list {
+	.subsection-list {
 		margin: 0 12px;
 
 		> ol {
diff --git a/cms/static/sass/_subsection.scss b/cms/static/sass/_subsection.scss
index 9b2ee5169f..a1d65e99e1 100644
--- a/cms/static/sass/_subsection.scss
+++ b/cms/static/sass/_subsection.scss
@@ -15,7 +15,7 @@
 		width: 100%;
 	}
 
-	.unit-list {
+	.sortable-unit-list {
 		ol {
 			@include tree-view;
 		}
diff --git a/cms/templates/edit_subsection.html b/cms/templates/edit_subsection.html
index f665cc6eba..57e00d6eef 100644
--- a/cms/templates/edit_subsection.html
+++ b/cms/templates/edit_subsection.html
@@ -27,7 +27,7 @@
           <label>Format:</label>
           <input type="text" value="${subsection.metadata['format'] if 'format' in subsection.metadata else ''}" class="unit-subtitle" data-metadata-name="format"/>
         </div>
-        <div class="unit-list">
+        <div class="sortable-unit-list">
           <label>Units:</label>
           ${units.enum_units(subsection, subsection_units=subsection_units)}
         </div>
diff --git a/cms/templates/overview.html b/cms/templates/overview.html
index f4055145fa..17283fe4b2 100644
--- a/cms/templates/overview.html
+++ b/cms/templates/overview.html
@@ -98,7 +98,7 @@
               <a href="#" class="drag-handle"></a>
             </div>
           </header>
-          <div class="unit-list">
+          <div class="subsection-list">
             <div class="list-header">
               <a href="#" class="new-subsection-item" data-template="${new_subsection_template}">
                 <span class="new-folder-icon"></span>New Subsection