diff --git a/Dnn.WebAnalytics.dnn b/Dnn.WebAnalytics.dnn
index 6516e00..9eb0239 100644
--- a/Dnn.WebAnalytics.dnn
+++ b/Dnn.WebAnalytics.dnn
@@ -36,6 +36,16 @@
                 <helpUrl />
                 <supportsPopUps>False</supportsPopUps>
               </moduleControl>
+              <moduleControl>
+                <controlKey>Admin</controlKey>
+                <controlSrc>DesktopModules/Dnn.WebAnalytics/MapSettings.ascx</controlSrc>
+                <supportsPartialRendering>True</supportsPartialRendering>
+                <controlTitle>VisitorsOnline Settings</controlTitle>
+                <controlType>Admin</controlType>
+                <iconFile />
+                <helpUrl />
+                <supportsPopUps>True</supportsPopUps>
+              </moduleControl>
             </moduleControls>
           </moduleDefinition>
         </moduleDefinitions>
@@ -150,15 +160,6 @@
                       <helpUrl />
                       <supportsPopUps>False</supportsPopUps>
                     </moduleControl>
-                    <moduleControl>
-                      <controlKey>Settings</controlKey>
-                      <controlSrc>DesktopModules/Dnn.WebAnalytics/MapSettings.ascx</controlSrc>
-                      <supportsPartialRendering>True</supportsPartialRendering>
-                      <controlTitle>VisitorsOnline Settings</controlTitle>
-                      <controlType>Admin</controlType>
-                      <iconFile />
-                      <helpUrl />
-                    </moduleControl>
                   </moduleControls>
                 </moduleDefinition>
               </moduleDefinitions>
@@ -167,4 +168,4 @@
         </components>
       </package>
   </packages>
-</dotnetnuke>
\ No newline at end of file
+</dotnetnuke>
diff --git a/Scripts/01.00.00.sql b/Scripts/01.00.00.sql
index 8c903c6..caac543 100644
--- a/Scripts/01.00.00.sql
+++ b/Scripts/01.00.00.sql
@@ -83,7 +83,7 @@ GO
 ALTER TABLE {databaseOwner}[{objectQualifier}Visits] CHECK CONSTRAINT [FK_{objectQualifier}Visits_Visitors]
 GO
 
-IF EXISTS(SELECT 1 FROM {databaseOwner}[{objectQualifier}Schedule] WHERE [TypeFullName] = N'Dnn.WebAnalyticsLinqToSql.VisitorJob, Dnn.WebAnalyticsLinqToSql')
+IF EXISTS(SELECT 1 FROM {databaseOwner}[{objectQualifier}Schedule] WHERE [TypeFullName] = N'Dnn.WebAnalytics.VisitorJob, Dnn.WebAnalytics')
 BEGIN
 	UPDATE {databaseOwner}[{objectQualifier}Schedule] 
 	SET 
@@ -99,12 +99,12 @@ BEGIN
 		[Servers] = null, 
 		[FriendlyName] = 'Visitor Tracking Job' 
 	WHERE 
-		[TypeFullName] = N'Dnn.WebAnalyticsLinqToSql.VisitorJob, Dnn.WebAnalyticsLinqToSql';
+		[TypeFullName] = N'Dnn.WebAnalytics.VisitorJob, Dnn.WebAnalytics';
 END
 ELSE
 BEGIN
 	INSERT INTO {databaseOwner}[{objectQualifier}Schedule]
 		( [TypeFullName], [TimeLapse], [TimeLapseMeasurement], [RetryTimeLapse], [RetryTimeLapseMeasurement], [RetainHistoryNum], [AttachToEvent], [CatchUpEnabled], [Enabled], [ObjectDependencies], [Servers], [FriendlyName])
-	VALUES ( 'Dnn.WebAnalyticsLinqToSql.VisitorJob, Dnn.WebAnalyticsLinqToSql', 1, 'd', 1, 'd', 10, '', 0, 1, '', null, 'Visitor Tracking Job' );
+	VALUES ( 'Dnn.WebAnalytics.VisitorJob, Dnn.WebAnalytics', 1, 'd', 1, 'd', 10, '', 0, 1, '', null, 'Visitor Tracking Job' );
 END
 GO
diff --git a/Scripts/Uninstall.sql b/Scripts/Uninstall.sql
index 3376d08..f0488a9 100644
--- a/Scripts/Uninstall.sql
+++ b/Scripts/Uninstall.sql
@@ -5,10 +5,10 @@ IF NOT OBJECT_ID('{databaseOwner}[{objectQualifier}Community_Visitors]') IS NULL
     DROP TABLE {databaseOwner}[{objectQualifier}Community_Visitors];
 GO
 
-IF EXISTS(SELECT 1 FROM {databaseOwner}[{objectQualifier}Schedule] WHERE [TypeFullName] = N'Dnn.WebAnalyticsLinqToSql.VisitorJob, Dnn.WebAnalyticsLinqToSql')
+IF EXISTS(SELECT 1 FROM {databaseOwner}[{objectQualifier}Schedule] WHERE [TypeFullName] = N'Dnn.WebAnalytics.VisitorJob, Dnn.WebAnalytics')
 BEGIN
 	DELETE FROM {databaseOwner}[{objectQualifier}Schedule] 
 	WHERE 
-		[TypeFullName] = N'Dnn.WebAnalyticsLinqToSql.VisitorJob, Dnn.WebAnalyticsLinqToSql';
+		[TypeFullName] = N'Dnn.WebAnalytics.VisitorJob, Dnn.WebAnalytics';
 END