diff --git a/example/mobile/res/sass/mobile-example.scss b/example/mobile/res/sass/mobile-example.scss
index f9f004baa4..99c14d305b 100644
--- a/example/mobile/res/sass/mobile-example.scss
+++ b/example/mobile/res/sass/mobile-example.scss
@@ -25,7 +25,7 @@
 
 @include phoneandtablet {
     // Show the Create button
-    .create-btn-holder {
+    .create-button-holder {
         display: block !important;
     }
 }
diff --git a/platform/commonUI/browse/res/templates/browse.html b/platform/commonUI/browse/res/templates/browse.html
index b47f23d231..aa1415ca81 100644
--- a/platform/commonUI/browse/res/templates/browse.html
+++ b/platform/commonUI/browse/res/templates/browse.html
@@ -31,7 +31,7 @@
                 <div class="abs holder l-flex-col holder-treeview-elements">
                     <mct-representation key="'create-button'"
                                         mct-object="navigatedObject"
-                                        class="holder flex-elem create-btn-holder">
+                                        class="holder flex-elem create-button-holder">
                     </mct-representation>
                     <mct-include key="'search'"
                                  ng-model="treeModel"
diff --git a/platform/commonUI/edit/res/templates/create/create-button.html b/platform/commonUI/edit/res/templates/create/create-button.html
index 77c6198cae..8a1e799783 100644
--- a/platform/commonUI/edit/res/templates/create/create-button.html
+++ b/platform/commonUI/edit/res/templates/create/create-button.html
@@ -20,7 +20,7 @@
  at runtime from the About dialog for additional information.
 -->
 <span ng-controller="ClickAwayController as createController">
-    <div class="s-menu-btn major create-btn" ng-click="createController.toggle()">
+    <div class="s-menu-button major create-button" ng-click="createController.toggle()">
 		<span class="title-label">Create</span>
     </div>
     <div class="menu super-menu" ng-show="createController.isActive()">
diff --git a/platform/commonUI/general/res/sass/_icons.scss b/platform/commonUI/general/res/sass/_icons.scss
index 725b92c628..a8990d4fe8 100644
--- a/platform/commonUI/general/res/sass/_icons.scss
+++ b/platform/commonUI/general/res/sass/_icons.scss
@@ -52,7 +52,7 @@
 	display: inline-block;
 }
 
-.s-menu-btn .invoke-menu,
+.s-menu-button .invoke-menu,
 .icon.major .invoke-menu {
 	margin-left: $interiorMarginSm;
 }
diff --git a/platform/commonUI/general/res/sass/controls/_controls.scss b/platform/commonUI/general/res/sass/controls/_controls.scss
index a35bd259e9..09837b7d1f 100644
--- a/platform/commonUI/general/res/sass/controls/_controls.scss
+++ b/platform/commonUI/general/res/sass/controls/_controls.scss
@@ -186,7 +186,7 @@ label.radio.custom {
 label.checkbox.custom input:checked ~ em:before { content: $glyph-icon-check; }
 label.radio.custom input:checked ~ em:before { content: $glyph-icon-bullet; }
 
-.s-menu-btn label.checkbox.custom {
+.s-menu-button label.checkbox.custom {
     margin-left: 5px;
 }
 
diff --git a/platform/commonUI/general/res/sass/controls/_menus.scss b/platform/commonUI/general/res/sass/controls/_menus.scss
index 709d06b40c..61e87b5b2b 100644
--- a/platform/commonUI/general/res/sass/controls/_menus.scss
+++ b/platform/commonUI/general/res/sass/controls/_menus.scss
@@ -20,7 +20,7 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 /******************************************************** MENU BUTTONS */
-.s-menu-btn {
+.s-menu-button {
 	// Formerly .btn-menu
 	@extend .s-button;
 	span.l-click-area {
@@ -53,7 +53,7 @@
 		color: rgba($colorInvokeMenu, percentToDecimal($contrastInvokeMenuPercent));
 	}
 
-	&.create-btn {
+	&.create-button {
         @extend .icon-plus;
 		.title-label {
 			font-size: 1rem;
@@ -122,7 +122,7 @@
 .icon-menu,
 .context-menu,
 .super-menu,
-.s-menu-btn .menu {
+.s-menu-button .menu {
 	pointer-events: auto;
 	ul li {
 		a.menu-item-a {
diff --git a/platform/commonUI/general/res/sass/mobile/_layout.scss b/platform/commonUI/general/res/sass/mobile/_layout.scss
index 4e7c2b01d4..784a41dc40 100644
--- a/platform/commonUI/general/res/sass/mobile/_layout.scss
+++ b/platform/commonUI/general/res/sass/mobile/_layout.scss
@@ -37,7 +37,7 @@ body.mobile {
         }
     }
 
-    .create-btn-holder {
+    .create-button-holder {
         // Hide the create button by default in mobile;
         // This can be overridden by the examples/mobile bundle
         display: none;
diff --git a/platform/commonUI/general/res/sass/user-environ/_frame.scss b/platform/commonUI/general/res/sass/user-environ/_frame.scss
index e2a6ae7716..eebf256633 100644
--- a/platform/commonUI/general/res/sass/user-environ/_frame.scss
+++ b/platform/commonUI/general/res/sass/user-environ/_frame.scss
@@ -50,7 +50,7 @@
 	}
 	&.frame-template {
 		.s-button,
-		.s-menu-btn {
+		.s-menu-button {
 			height: $ohH;
 			line-height: $ohH;
 			padding: 0 $interiorMargin;
@@ -60,7 +60,7 @@
 			}
 		}
 
-		.s-menu-btn:after {
+		.s-menu-button:after {
 			font-size: 8px;
 		}
 
diff --git a/platform/commonUI/general/res/sass/user-environ/_layout.scss b/platform/commonUI/general/res/sass/user-environ/_layout.scss
index d70e4e21e6..9740171ff0 100644
--- a/platform/commonUI/general/res/sass/user-environ/_layout.scss
+++ b/platform/commonUI/general/res/sass/user-environ/_layout.scss
@@ -192,11 +192,11 @@ body.desktop .pane .mini-tab-icon.toggle-pane {
         right: 0;
         bottom: $interiorMargin;
         left: $bodyMargin;
-        .create-btn-holder {
+        .create-button-holder {
             &.s-status-editing {
                 display: none;
                 & + .search-holder .search-bar {
-                    // .search-holder is adjacent sibling to .create-btn-holder
+                    // .search-holder is adjacent sibling to .create-button-holder
                     // Add right margin when create button is hidden, to make room for the collapse pane 'x' button
                     margin-right: $interiorMarginLg * 2;
                 }
@@ -239,9 +239,9 @@ body.desktop .pane .mini-tab-icon.toggle-pane {
 
 .object-browse-bar .s-button,
 .top-bar .buttons-main .s-button,
-.top-bar .s-menu-btn,
+.top-bar .s-menu-button,
 .tool-bar .s-button,
-.tool-bar .s-menu-btn {
+.tool-bar .s-menu-button {
     $h: $btnToolbarH;
     height: $h;
     line-height: $h;
diff --git a/platform/commonUI/general/res/templates/controls/switcher.html b/platform/commonUI/general/res/templates/controls/switcher.html
index fb12d431ee..9f6b0c5f8c 100644
--- a/platform/commonUI/general/res/templates/controls/switcher.html
+++ b/platform/commonUI/general/res/templates/controls/switcher.html
@@ -20,7 +20,7 @@
  at runtime from the About dialog for additional information.
 -->
 <span ng-controller="ViewSwitcherController">
-    <div class="view-switcher menu-element s-menu-btn {{ngModel.selected.cssclass}}"
+    <div class="view-switcher menu-element s-menu-button {{ngModel.selected.cssclass}}"
 	    ng-if="view.length > 1"
 	    ng-controller="ClickAwayController as toggle">
 
diff --git a/platform/features/plot/res/templates/plot.html b/platform/features/plot/res/templates/plot.html
index a35929324c..6dc3cd71b9 100644
--- a/platform/features/plot/res/templates/plot.html
+++ b/platform/features/plot/res/templates/plot.html
@@ -97,7 +97,7 @@
                    ng-show="plot.isZoomed()"
                    title="Reset pan/zoom">
                 </a>
-                <div class="menu-element s-menu-btn menus-to-left {{plot.getMode().cssclass}}"
+                <div class="menu-element s-menu-button menus-to-left {{plot.getMode().cssclass}}"
                      ng-if="plot.getModeOptions().length > 1"
                      ng-controller="ClickAwayController as toggle">
                     <span class="l-click-area" ng-click="toggle.toggle()"></span>
diff --git a/platform/features/table/res/templates/mct-table.html b/platform/features/table/res/templates/mct-table.html
index 7cb8a99111..6d96b17afd 100644
--- a/platform/features/table/res/templates/mct-table.html
+++ b/platform/features/table/res/templates/mct-table.html
@@ -1,4 +1,4 @@
-<a class="t-btn l-btn s-button t-export icon-download labeled"
+<a class="s-button t-export icon-download labeled"
    ng-click="exportAsCSV()"
    title="Export This View's Data">
     Export
diff --git a/platform/features/timeline/res/templates/timeline.html b/platform/features/timeline/res/templates/timeline.html
index 33458d4ebf..d4c022f150 100644
--- a/platform/features/timeline/res/templates/timeline.html
+++ b/platform/features/timeline/res/templates/timeline.html
@@ -102,20 +102,20 @@
 
         <!-- TOP PANE GANTT BARS -->
         <div class="split-pane-component l-timeline-pane t-pane-h l-pane-top t-timeline-gantt l-timeline-gantt s-timeline-gantt">
-            <div class="l-hover-btns-holder s-hover-btns-holder t-btns-zoom">
-                <a class="t-btn l-btn s-button icon-arrows-out"
+            <div class="l-hover-btns-holder s-hover-btns-holder">
+                <a class="s-button icon-arrows-out"
                    ng-click="zoomController.fit()"
                    ng-show="true"
                    title="Zoom to fit">
                 </a>
 
-                <a class="t-btn l-btn s-button icon-magnify-in"
+                <a class="s-button icon-magnify-in"
                    ng-click="zoomController.zoom(-1)"
                    ng-show="true"
                    title="Zoom in">
                 </a>
 
-                <a class="t-btn l-btn s-button icon-magnify-out"
+                <a class="s-button icon-magnify-out"
                    ng-click="zoomController.zoom(1)"
                    ng-show="true"
                    title="Zoom out">
diff --git a/platform/forms/res/templates/controls/color.html b/platform/forms/res/templates/controls/color.html
index f99c7d158c..e7e4913341 100644
--- a/platform/forms/res/templates/controls/color.html
+++ b/platform/forms/res/templates/controls/color.html
@@ -19,7 +19,7 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-<div class="t-btn l-btn s-button s-menu-btn menu-element t-color-palette {{structure.cssclass}}"
+<div class="s-button s-menu-button menu-element t-color-palette {{structure.cssclass}}"
     ng-controller="ClickAwayController as toggle">
 
     <span class="l-click-area" ng-click="toggle.toggle()"></span>
diff --git a/platform/forms/res/templates/controls/menu-button.html b/platform/forms/res/templates/controls/menu-button.html
index f318a9395b..bb57c9cdda 100644
--- a/platform/forms/res/templates/controls/menu-button.html
+++ b/platform/forms/res/templates/controls/menu-button.html
@@ -19,7 +19,7 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-<div class="s-menu-btn menu-element {{ structure.cssclass }}"
+<div class="s-menu-button menu-element {{ structure.cssclass }}"
      ng-controller="ClickAwayController as toggle">
 
     <span class="l-click-area" ng-click="toggle.toggle()"></span>