diff --git a/js/GeoCoding/GeoCodingHeader.js b/js/GeoCoding/GeoCodingHeader.js
index d911d401..14b99d1f 100644
--- a/js/GeoCoding/GeoCodingHeader.js
+++ b/js/GeoCoding/GeoCodingHeader.js
@@ -1,23 +1,23 @@
-define(["dojo/Evented", "dojo/_base/declare", "dojo/_base/lang", "dojo/has", "esri/kernel", 
-    "dijit/_WidgetBase", "dijit/_TemplatedMixin", 
-    "dojo/on", 
+define(["dojo/Evented", "dojo/_base/declare", "dojo/_base/lang", "dojo/has", "esri/kernel",
+    "dijit/_WidgetBase", "dijit/_TemplatedMixin",
+    "dojo/on",
     "esri/tasks/locator", "esri/geometry/webMercatorUtils",
-    "dojo/query", 
-    "dojo/text!application/GeoCoding/templates/GeoCodingHeader.html", 
-    "dojo/dom", "dojo/dom-class", "dojo/dom-attr", "dojo/dom-style", "dojo/dom-construct", 
+    "dojo/query",
+    "dojo/text!application/GeoCoding/Templates/GeoCodingHeader.html",
+    "dojo/dom", "dojo/dom-class", "dojo/dom-attr", "dojo/dom-style", "dojo/dom-construct",
     "dojo/parser", "dojo/ready",
     "dojo/i18n!application/nls/PopupInfo",
     "application/GeoCoding/GeoAddressTooltip",
     "dojox/gfx"
-    
+
     ], function (
         Evented, declare, lang, has, esriNS,
-        _WidgetBase, _TemplatedMixin, 
-        on, 
+        _WidgetBase, _TemplatedMixin,
+        on,
         Locator, webMercatorUtils,
         query,
-        GeoCodingHeaderTemplate, 
-        dom, domClass, domAttr, domStyle, domConstruct, 
+        GeoCodingHeaderTemplate,
+        dom, domClass, domAttr, domStyle, domConstruct,
         parser, ready,
         i18n,
         GeoAddressTooltip,
@@ -34,7 +34,7 @@ define(["dojo/Evented", "dojo/_base/declare", "dojo/_base/lang", "dojo/has", "es
 
         options: {
             map: null,
-            toolbar: null, 
+            toolbar: null,
             header: 'pageHeader_geoCoding',
             id: 'geoCodingHeadrId',
             popupInfo: null,
@@ -88,7 +88,7 @@ define(["dojo/Evented", "dojo/_base/declare", "dojo/_base/lang", "dojo/has", "es
             this.loaded = true;
 
             this.addressTooltipButton = query('#'+this.popupHeaderId+' .popupInfoButton.tooltips')[0];
-            
+
             if(this.addressTooltipButton) {
                 on(this.addressTooltipButton, 'click', lang.hitch(this, this.switchTooltips));
             }
@@ -100,7 +100,7 @@ define(["dojo/Evented", "dojo/_base/declare", "dojo/_base/lang", "dojo/has", "es
             buttons.forEach(lang.hitch(this, function (btn) {
                 on(btn,'keydown', lang.hitch(this, function(ev) {
                     switch(ev.keyCode) {
-                        case 13: 
+                        case 13:
                             btn.click();
                             ev.stopPropagation();
                             ev.preventDefault();
@@ -140,7 +140,7 @@ define(["dojo/Evented", "dojo/_base/declare", "dojo/_base/lang", "dojo/has", "es
 
                 this.geoAddressTooltip = new GeoAddressTooltip({
                     map: this.map,
-                    toolbar: this.toolbar, 
+                    toolbar: this.toolbar,
                     addressTooltipButton: this.addressTooltipButton,
                     iconColor: this.iconColor,
                     themeColor: this.themeColor,
@@ -221,7 +221,7 @@ define(["dojo/Evented", "dojo/_base/declare", "dojo/_base/lang", "dojo/has", "es
         },
 
         clearSuperNavigator: function() {
-            if(this.superNavigator) 
+            if(this.superNavigator)
                 this.superNavigator.clearZone();
         },
 
diff --git a/js/GeoCoding/Templates/geoCodingHeader.html b/js/GeoCoding/Templates/GeoCodingHeader.html
similarity index 100%
rename from js/GeoCoding/Templates/geoCodingHeader.html
rename to js/GeoCoding/Templates/GeoCodingHeader.html
diff --git a/js/PopupInfo/PopupInfoHeader.js b/js/PopupInfo/PopupInfoHeader.js
index 5c774bf3..6a1715cb 100644
--- a/js/PopupInfo/PopupInfoHeader.js
+++ b/js/PopupInfo/PopupInfoHeader.js
@@ -1,24 +1,24 @@
-define(["dojo/Evented", "dojo/_base/declare", "dojo/_base/lang", "dojo/has", "esri/kernel", 
+define(["dojo/Evented", "dojo/_base/declare", "dojo/_base/lang", "dojo/has", "esri/kernel",
     "dijit/_WidgetBase", "dijit/_TemplatedMixin", "dijit/registry",
-    "dojo/on", 
-    "dojo/Deferred", "dojo/query", 
-    "dojo/text!application/PopupInfo/templates/PopupInfoHeader.html", 
-    "dojo/dom", "dojo/dom-class", "dojo/dom-attr", "dojo/dom-style", "dojo/dom-construct", "dojo/_base/event", 
+    "dojo/on",
+    "dojo/Deferred", "dojo/query",
+    "dojo/text!application/PopupInfo/Templates/PopupInfoHeader.html", 
+    "dojo/dom", "dojo/dom-class", "dojo/dom-attr", "dojo/dom-style", "dojo/dom-construct", "dojo/_base/event",
     "dojo/parser", "dojo/ready",
-    "dijit/layout/ContentPane",    
-    "dojo/string", 
+    "dijit/layout/ContentPane",
+    "dojo/string",
     "dojo/i18n!application/nls/PopupInfo",
     "esri/domUtils",
     "esri/dijit/Popup",
     "dojo/NodeList-dom", "dojo/NodeList-traverse"
-    
+
     ], function (
         Evented, declare, lang, has, esriNS,
         _WidgetBase, _TemplatedMixin, registry,
-        on, 
+        on,
         Deferred, query,
-        PopupInfoHeaderTemplate, 
-        dom, domClass, domAttr, domStyle, domConstruct, event, 
+        PopupInfoHeaderTemplate,
+        dom, domClass, domAttr, domStyle, domConstruct, event,
         parser, ready,
         ContentPane,
         string,
@@ -37,7 +37,7 @@ define(["dojo/Evented", "dojo/_base/declare", "dojo/_base/lang", "dojo/has", "es
 
         options: {
             map: null,
-            toolbar: null, 
+            toolbar: null,
             header: 'pageHeader_infoPanel',
             id: 'popupInfoHeadrId',
             popupInfo: null,
@@ -95,7 +95,7 @@ define(["dojo/Evented", "dojo/_base/declare", "dojo/_base/lang", "dojo/has", "es
             buttons.forEach(lang.hitch(this, function (btn) {
                 on(btn,'keydown', lang.hitch(this, function(ev) {
                     switch(ev.keyCode) {
-                        case 13: 
+                        case 13:
                             btn.click();
                             ev.stopPropagation();
                             ev.preventDefault();
@@ -169,7 +169,7 @@ define(["dojo/Evented", "dojo/_base/declare", "dojo/_base/lang", "dojo/has", "es
             if(!this.pagerIsVisible()) return;
             var _prev = query('.popupInfoButton.prev')[0];
             _prev.focus();
-            _prev.click();        
+            _prev.click();
         },
 
         ToNext:function() {
@@ -269,7 +269,7 @@ define(["dojo/Evented", "dojo/_base/declare", "dojo/_base/lang", "dojo/has", "es
         },
 
         clearSuperNavigator: function() {
-            if(this.superNavigator) 
+            if(this.superNavigator)
                 this.superNavigator.clearZone();
         },