diff --git a/.gitignore b/.gitignore
index b6866e736a..8f474c1974 100644
--- a/.gitignore
+++ b/.gitignore
@@ -74,10 +74,10 @@ bin/
 lms/static/css/
 lms/static/sass/*.css
 lms/static/sass/*.css.map
-lms/static/sass/application.scss
-lms/static/sass/application-rtl.scss
-lms/static/sass/course.scss
-lms/static/sass/course-rtl.scss
+lms/static/sass/lms-main.scss
+lms/static/sass/lms-main-rtl.scss
+lms/static/sass/lms-course.scss
+lms/static/sass/lms-course-rtl.scss
 cms/static/css/
 cms/static/sass/*.css
 cms/static/sass/*.css.map
diff --git a/lms/envs/common.py b/lms/envs/common.py
index c9559c3c85..3a31afbb7b 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -1269,19 +1269,19 @@ PIPELINE_CSS = {
         ],
         'output_filename': 'css/lms-style-vendor-tinymce-skin.css',
     },
-    'style-app': {
+    'style-main': {
         'source_filenames': [
-            'sass/application.css',
+            'sass/lms-main.css',
             'sass/ie.css'
         ],
-        'output_filename': 'css/lms-style-app.css',
+        'output_filename': 'css/lms-main.css',
     },
-    'style-app-rtl': {
+    'style-main-rtl': {
         'source_filenames': [
-            'sass/application-rtl.css',
+            'sass/lms-main-rtl.css',
             'sass/ie-rtl.css'
         ],
-        'output_filename': 'css/lms-style-app-rtl.css',
+        'output_filename': 'css/lms-main-rtl.css',
     },
     'style-course-vendor': {
         'source_filenames': [
@@ -1291,26 +1291,26 @@ PIPELINE_CSS = {
         ],
         'output_filename': 'css/lms-style-course-vendor.css',
     },
+    'style-course': {
+        'source_filenames': [
+            'sass/lms-course.css',
+            'xmodule/modules.css',
+        ],
+        'output_filename': 'css/lms-course.css',
+    },
+    'style-course-rtl': {
+        'source_filenames': [
+            'sass/lms-course-rtl.css',
+            'xmodule/modules.css',
+        ],
+        'output_filename': 'css/lms-course-rtl.css',
+    },
     'style-student-notes': {
         'source_filenames': [
             'css/vendor/edxnotes/annotator.min.css',
         ],
         'output_filename': 'css/lms-style-student-notes.css',
     },
-    'style-course': {
-        'source_filenames': [
-            'sass/course.css',
-            'xmodule/modules.css',
-        ],
-        'output_filename': 'css/lms-style-course.css',
-    },
-    'style-course-rtl': {
-        'source_filenames': [
-            'sass/course-rtl.css',
-            'xmodule/modules.css',
-        ],
-        'output_filename': 'css/lms-style-course-rtl.css',
-    },
     'style-xmodule-annotations': {
         'source_filenames': [
             'css/vendor/ova/annotator.css',
diff --git a/lms/static/.gitignore b/lms/static/.gitignore
index afc42d5e7e..611e597b89 100644
--- a/lms/static/.gitignore
+++ b/lms/static/.gitignore
@@ -4,6 +4,6 @@
 *.swp
 *.orig
 *.DS_Store
-application.css
+style-main.css
 ie.css
 Gemfile.lock
diff --git a/lms/static/sass/_build-course.scss b/lms/static/sass/_build-course.scss
index cc8d3b0cbf..1f7fd8b926 100644
--- a/lms/static/sass/_build-course.scss
+++ b/lms/static/sass/_build-course.scss
@@ -1,7 +1,7 @@
 // ------------------------------
 // LMS Courseware: Shared Build Compile
 
-// About: Sass compile for the LMS Courseware Elements that are shared between LTR and RTL UI. Configuration and vendor specific imports happen before this shared set of imports are compiled in the main-*.scss files.
+// About: Sass compile for the LMS Courseware Elements that are shared between LTR and RTL UI. Configuration and vendor specific imports happen before this shared set of imports are compiled in the lms-course-*.scss files.
 
 @import 'base/base';
 @import 'base/extends';
diff --git a/lms/static/sass/_build-lms.scss b/lms/static/sass/_build-lms.scss
index 0995a1325c..dde9242f6c 100644
--- a/lms/static/sass/_build-lms.scss
+++ b/lms/static/sass/_build-lms.scss
@@ -1,7 +1,7 @@
 // ------------------------------
 // LMS: Shared Build Compile
 
-// About: Sass compile for the LMS Elements that are shared between LTR and RTL UI. Configuration and vendor specific imports happen before this shared set of imports are compiled in the main-*.scss files.
+// About: Sass compile for the LMS Elements that are shared between LTR and RTL UI. Configuration and vendor specific imports happen before this shared set of imports are compiled in the lms-main-*.scss files.
 
 // base - assets
 @import 'base/font_face';
diff --git a/lms/static/sass/course-rtl.scss.mako b/lms/static/sass/lms-course-rtl.scss.mako
similarity index 100%
rename from lms/static/sass/course-rtl.scss.mako
rename to lms/static/sass/lms-course-rtl.scss.mako
diff --git a/lms/static/sass/course.scss.mako b/lms/static/sass/lms-course.scss.mako
similarity index 100%
rename from lms/static/sass/course.scss.mako
rename to lms/static/sass/lms-course.scss.mako
diff --git a/lms/static/sass/application-rtl.scss.mako b/lms/static/sass/lms-main-rtl.scss.mako
similarity index 100%
rename from lms/static/sass/application-rtl.scss.mako
rename to lms/static/sass/lms-main-rtl.scss.mako
diff --git a/lms/static/sass/application.scss.mako b/lms/static/sass/lms-main.scss.mako
similarity index 100%
rename from lms/static/sass/application.scss.mako
rename to lms/static/sass/lms-main.scss.mako
diff --git a/lms/templates/main.html b/lms/templates/main.html
index 9dd5b4e310..438d243aea 100644
--- a/lms/templates/main.html
+++ b/lms/templates/main.html
@@ -65,7 +65,7 @@
   <link rel="icon" type="image/x-icon" href="${static.url(microsite.get_value('favicon_path', settings.FAVICON_PATH))}" />
 
   <%static:css group='style-vendor'/>
-  <%static:css group='style-app'/>
+  <%static:css group='style-main'/>
 
   % if disable_courseware_js:
     <%static:js group='base_vendor'/>
diff --git a/lms/templates/main_django.html b/lms/templates/main_django.html
index ae85eb2226..bf8736211f 100644
--- a/lms/templates/main_django.html
+++ b/lms/templates/main_django.html
@@ -8,7 +8,7 @@
  <link rel="icon" type="image/x-icon" href="{% favicon_path %}" />
 
   {% compressed_css 'style-vendor' %}
-  {% compressed_css 'style-app' %}
+  {% compressed_css 'style-main' %}
   {% compressed_css 'style-course-vendor' %}
   {% compressed_css 'style-course' %}
 
diff --git a/lms/templates/mktg_iframe.html b/lms/templates/mktg_iframe.html
index b6359f89dc..0ed7567447 100644
--- a/lms/templates/mktg_iframe.html
+++ b/lms/templates/mktg_iframe.html
@@ -12,7 +12,7 @@
   <meta name="google-site-verification" content="_mipQ4AtZQDNmbtOkwehQDOgCxUUV2fb_C0b6wbiRHY" />
 
   <%static:css group='style-vendor'/>
-  <%static:css group='style-app'/>
+  <%static:css group='style-main'/>
   <%static:js group='base_vendor'/>
 
   <!--[if lt IE 9]>