diff --git a/src/components/uiOptions/js/FullNoPreviewUIOptions.js b/src/components/uiOptions/js/FullNoPreviewUIOptions.js
index a3a2954a8e..92104ceb60 100644
--- a/src/components/uiOptions/js/FullNoPreviewUIOptions.js
+++ b/src/components/uiOptions/js/FullNoPreviewUIOptions.js
@@ -26,13 +26,6 @@ var fluid_1_5 = fluid_1_5 || {};
     fluid.defaults("fluid.uiOptions.fullNoPreview", {
         gradeNames: ["fluid.uiOptions.inline", "autoInit"],
         container: "{fullNoPreview}.container",
-        templateLoader: {
-            options: {
-                templates: {
-                    uiOptions: "%prefix/FullNoPreviewUIOptions.html"
-                }
-            }
-        },
         uiOptions: {
             options: {
                 listeners: {
diff --git a/src/components/uiOptions/js/FullPreviewUIOptions.js b/src/components/uiOptions/js/FullPreviewUIOptions.js
index e765d66817..2e391c2f54 100644
--- a/src/components/uiOptions/js/FullPreviewUIOptions.js
+++ b/src/components/uiOptions/js/FullPreviewUIOptions.js
@@ -27,13 +27,6 @@ var fluid_1_5 = fluid_1_5 || {};
         gradeNames: ["fluid.uiOptions.inline", "autoInit"],
         container: "{fullPreview}.container",
         outerPreviewEnhancerOptions: "{originalEnhancerOptions}.options.originalUserOptions",
-        templateLoader: {
-            options: {
-                templates: {
-                    uiOptions: "%prefix/FullPreviewUIOptions.html"
-                }
-            }
-        },
         uiOptions: {
             options: {
                 components: {
diff --git a/src/components/uiOptions/js/StarterGrades.js b/src/components/uiOptions/js/StarterGrades.js
index b53845b285..ed4a7e6663 100644
--- a/src/components/uiOptions/js/StarterGrades.js
+++ b/src/components/uiOptions/js/StarterGrades.js
@@ -358,18 +358,38 @@ var fluid_1_5 = fluid_1_5 || {};
      * @param {Object} options
      */
 
-    fluid.defaults("fluid.uiOptions.starterTemplateLoader", {
-        gradeNames: ["fluid.uiOptions.resourceLoader", "autoInit"],
-        templates: {
-            uiOptions: "%prefix/FatPanelUIOptions.html",
-            textSize: "%prefix/UIOptionsTemplate-textSize.html",
-            textFont: "%prefix/UIOptionsTemplate-textFont.html",
-            lineSpace: "%prefix/UIOptionsTemplate-lineSpace.html",
-            contrast: "%prefix/UIOptionsTemplate-contrast.html",
-            layoutControls: "%prefix/UIOptionsTemplate-layout.html",
-            linksControls: "%prefix/UIOptionsTemplate-links.html"
-        }
-    });
+     fluid.defaults("fluid.uiOptions.starterTemplateLoader", {
+         gradeNames: ["fluid.uiOptions.resourceLoader", "autoInit"],
+         templates: {
+             textSize: "%prefix/UIOptionsTemplate-textSize.html",
+             textFont: "%prefix/UIOptionsTemplate-textFont.html",
+             lineSpace: "%prefix/UIOptionsTemplate-lineSpace.html",
+             contrast: "%prefix/UIOptionsTemplate-contrast.html",
+             layoutControls: "%prefix/UIOptionsTemplate-layout.html",
+             linksControls: "%prefix/UIOptionsTemplate-links.html"
+         }
+     });
+
+     fluid.defaults("fluid.uiOptions.starterFatPanelTemplateLoader", {
+         gradeNames: ["fluid.uiOptions.starterTemplateLoader", "autoInit"],
+         templates: {
+             uiOptions: "%prefix/FatPanelUIOptions.html"
+         }
+     });
+
+     fluid.defaults("fluid.uiOptions.starterFullPreviewTemplateLoader", {
+         gradeNames: ["fluid.uiOptions.starterTemplateLoader", "autoInit"],
+         templates: {
+             uiOptions: "%prefix/FullPreviewUIOptions.html"
+         }
+     });
+
+     fluid.defaults("fluid.uiOptions.starterFullNoPreviewTemplateLoader", {
+         gradeNames: ["fluid.uiOptions.starterTemplateLoader", "autoInit"],
+         templates: {
+             uiOptions: "%prefix/FullNoPreviewUIOptions.html"
+         }
+     });
 
     /******************************
      * Starter Message Loader
diff --git a/src/demos/uiOptions/js/uiOptionsDemo.js b/src/demos/uiOptions/js/uiOptionsDemo.js
index e76bf0d61f..4ede5799ee 100644
--- a/src/demos/uiOptions/js/uiOptionsDemo.js
+++ b/src/demos/uiOptions/js/uiOptionsDemo.js
@@ -71,7 +71,7 @@ var demo = demo || {};
     //     messagePrefix: pathToMessages,
     //     templateLoader: {
     //         options: {
-    //             gradeNames: ["fluid.uiOptions.starterTemplateLoader"]
+    //             gradeNames: ["fluid.uiOptions.starterFatPanelTemplateLoader"]
     //         }
     //     },
     //     messageLoader: {
diff --git a/src/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js b/src/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
index b1ef1950be..6f0946277f 100644
--- a/src/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
+++ b/src/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
@@ -52,7 +52,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
                     },
                     templateLoader: {
                         options: {
-                            gradeNames: ["fluid.uiOptions.starterTemplateLoader"]
+                            gradeNames: ["fluid.uiOptions.starterFatPanelTemplateLoader"]
                         }
                     },
                     messageLoader: {
diff --git a/src/tests/component-tests/uiOptions/js/IntegrationTestsCommon.js b/src/tests/component-tests/uiOptions/js/IntegrationTestsCommon.js
index 48bac3c092..5457c8747b 100644
--- a/src/tests/component-tests/uiOptions/js/IntegrationTestsCommon.js
+++ b/src/tests/component-tests/uiOptions/js/IntegrationTestsCommon.js
@@ -152,7 +152,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
                 },
                 templateLoader: {
                     options: {
-                        gradeNames: ["fluid.uiOptions.starterTemplateLoader"]
+                        gradeNames: ["fluid.uiOptions.starterFullPreviewTemplateLoader"]
                     }
                 },
                 messageLoader: {
@@ -240,7 +240,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
         },
         templateLoader: {
             options: {
-                gradeNames: ["fluid.uiOptions.starterTemplateLoader"]
+                gradeNames: ["fluid.uiOptions.starterFullPreviewTemplateLoader"]
             }
         },
         messageLoader: {
diff --git a/src/tests/component-tests/uiOptions/js/UIOptionsTests.js b/src/tests/component-tests/uiOptions/js/UIOptionsTests.js
index 4e02312588..cfae95ceaa 100644
--- a/src/tests/component-tests/uiOptions/js/UIOptionsTests.js
+++ b/src/tests/component-tests/uiOptions/js/UIOptionsTests.js
@@ -40,7 +40,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
                 templateLoader: {
                     type: "fluid.uiOptions.resourceLoader",
                     options: {
-                        gradeNames: ["fluid.uiOptions.starterTemplateLoader"],
+                        gradeNames: ["fluid.uiOptions.starterFullNoPreviewTemplateLoader"],
                         templates: {
                             uiOptions: templatePrefix + "FullNoPreviewUIOptions.html"
                         },
@@ -76,19 +76,6 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
             gradeNames: ["fluid.uiOptionsDefaultTests", "autoInit"]
         });
 
-        // Supply the paths to templates and message json files
-        // fluid.demands("fluid.uiOptions.resourcePath", ["fluid.uiOptionsTests", "fluid.uiOptions.tests", "fluid.uiOptions.starterTemplateLoader"], {
-        //     options: {
-        //         value: templatePrefix
-        //     }
-        // });
-
-        // fluid.demands("fluid.uiOptions.resourcePath", ["fluid.uiOptionsTests", "fluid.uiOptions.tests", "fluid.uiOptions.starterMessageLoader"], {
-        //     options: {
-        //         value: messagePrefix
-        //     }
-        // });
-
         // Options for UIOptions
         var saveCalled = false;
 
diff --git a/src/tests/manual-tests/js/someKindOfNews.js b/src/tests/manual-tests/js/someKindOfNews.js
index 285d194add..d2a32b4a5d 100644
--- a/src/tests/manual-tests/js/someKindOfNews.js
+++ b/src/tests/manual-tests/js/someKindOfNews.js
@@ -44,7 +44,7 @@ var skon = skon || {};
             },
             templateLoader: {
                 options: {
-                    gradeNames: ["fluid.uiOptions.starterTemplateLoader"]
+                    gradeNames: ["fluid.uiOptions.starterFatPanelTemplateLoader"]
                 }
             },
             uiOptions: {
diff --git a/src/tests/manual-tests/js/uiOptionsFullPage.js b/src/tests/manual-tests/js/uiOptionsFullPage.js
index 85cb3996ab..fcd66cbd5e 100644
--- a/src/tests/manual-tests/js/uiOptionsFullPage.js
+++ b/src/tests/manual-tests/js/uiOptionsFullPage.js
@@ -70,11 +70,6 @@ var demo = demo || {};
         // Tell UIOptions where to find all the templates, relative to this file
         templatePrefix: pathToTemplates,
         messagePrefix: pathToMessages,
-        templateLoader: {
-            options: {
-                gradeNames: ["fluid.uiOptions.starterTemplateLoader"]
-            }
-        },
         messageLoader: {
             options: {
                 gradeNames: ["fluid.uiOptions.starterMessageLoader"]
@@ -97,14 +92,28 @@ var demo = demo || {};
      * Initialize UI Options on the "Full Page, No Preview" version.
      */
     demo.initFullNoPreview = function (container, options) {
-        fluid.uiOptions.fullNoPreview(container, $.extend(true, {}, basicFullPageOpts, options));
+        var noPreviewOps = {
+            templateLoader: {
+                options: {
+                    gradeNames: ["fluid.uiOptions.starterFullNoPreviewTemplateLoader"]
+                }
+            }
+        };
+        fluid.uiOptions.fullNoPreview(container, $.extend(true, {}, basicFullPageOpts, noPreviewOps, options));
     };
 
     /**
      * Initialize UI Options on the "Full Page, With Preview" version.
      */
     demo.initFullWithPreview = function (container, options) {
-        fluid.uiOptions.fullPreview(container, $.extend(true, {}, basicFullPageOpts, options));
+        var previewOps = {
+            templateLoader: {
+                options: {
+                    gradeNames: ["fluid.uiOptions.starterFullPreviewTemplateLoader"]
+                }
+            }
+        };
+        fluid.uiOptions.fullPreview(container, $.extend(true, {}, basicFullPageOpts, previewOps, options));
     };
 
 })(jQuery, fluid);