diff --git a/cms/static/sass/_base.scss b/cms/static/sass/_base.scss
index 391896296d..054a401e4b 100644
--- a/cms/static/sass/_base.scss
+++ b/cms/static/sass/_base.scss
@@ -877,7 +877,7 @@ body.js {
       text-align: center;
 
       .label {
-        @extend .text-sr;
+        @extend .cont-text-sr;
       }
 
       [class^="icon-"] {
diff --git a/cms/static/sass/elements/_sock.scss b/cms/static/sass/elements/_sock.scss
index 6b9b52860f..ff79cb10ef 100644
--- a/cms/static/sass/elements/_sock.scss
+++ b/cms/static/sass/elements/_sock.scss
@@ -113,7 +113,7 @@
         }
 
         .action-primary {
-          @extend .ui-btn-primary-blue;
+          @extend .btn-primary-blue;
           @extend .t-action3;
         }
       }
diff --git a/cms/static/sass/views/_textbooks.scss b/cms/static/sass/views/_textbooks.scss
index 964615e16e..8d2b2d9489 100644
--- a/cms/static/sass/views/_textbooks.scss
+++ b/cms/static/sass/views/_textbooks.scss
@@ -188,7 +188,7 @@ body.course.textbooks {
 
       .chapters-fields,
       .textbook-fields {
-        @extend .no-list;
+        @extend .cont-no-list;
 
         .field {
           margin: 0 0 ($baseline*0.75) 0;
@@ -365,7 +365,7 @@ body.course.textbooks {
 
  // dialog
 .wrapper-dialog {
-  @extend .depth5;
+  @extend .ui-depth5;
   @include transition(all 0.05s ease-in-out);
   position: fixed;
   top: 0;
diff --git a/common/static/sass/_mixins.scss b/common/static/sass/_mixins.scss
index 68a57e5077..d3ead53b25 100644
--- a/common/static/sass/_mixins.scss
+++ b/common/static/sass/_mixins.scss
@@ -53,8 +53,8 @@
 // extends - UI - window
 .ui-window {
   @include clearfix();
-  @include border-radius(3px);
-  @include box-shadow(0 1px 1px $shadow-l1);
+  border-radius: 3px;
+  box-shadow: 0 1px 1px $shadow-l1;
   margin-bottom: $baseline;
   border: 1px solid $gray-l2;
   background: $white;
@@ -198,7 +198,7 @@
   }
 
   span {
-    @extend .text-sr;
+    @extend .cont-text-sr;
   }
 }
 
@@ -257,4 +257,3 @@
   white-space: nowrap;
   text-overflow: ellipsis;
 }
->>>>>>> Studio: renames and re-orgs app-wide Sass extends