diff --git a/Panel Control/App.config b/POGOserver Control/App.config
similarity index 100%
rename from Panel Control/App.config
rename to POGOserver Control/App.config
diff --git a/Panel Control/My Project/Application.Designer.vb b/POGOserver Control/My Project/Application.Designer.vb
similarity index 96%
rename from Panel Control/My Project/Application.Designer.vb
rename to POGOserver Control/My Project/Application.Designer.vb
index ffcedd2..cf61cbd 100644
--- a/Panel Control/My Project/Application.Designer.vb	
+++ b/POGOserver Control/My Project/Application.Designer.vb	
@@ -32,7 +32,7 @@ Namespace My
         
         <Global.System.Diagnostics.DebuggerStepThroughAttribute()>  _
         Protected Overrides Sub OnCreateMainForm()
-            Me.MainForm = Global.Panel_Control.POGOserver
+            Me.MainForm = Global.POGOserver_Control.POGOserver
         End Sub
     End Class
 End Namespace
diff --git a/Panel Control/My Project/Application.myapp b/POGOserver Control/My Project/Application.myapp
similarity index 100%
rename from Panel Control/My Project/Application.myapp
rename to POGOserver Control/My Project/Application.myapp
diff --git a/Panel Control/My Project/AssemblyInfo.vb b/POGOserver Control/My Project/AssemblyInfo.vb
similarity index 100%
rename from Panel Control/My Project/AssemblyInfo.vb
rename to POGOserver Control/My Project/AssemblyInfo.vb
diff --git a/Panel Control/My Project/Resources.Designer.vb b/POGOserver Control/My Project/Resources.Designer.vb
similarity index 96%
rename from Panel Control/My Project/Resources.Designer.vb
rename to POGOserver Control/My Project/Resources.Designer.vb
index ad79766..f5fc633 100644
--- a/Panel Control/My Project/Resources.Designer.vb	
+++ b/POGOserver Control/My Project/Resources.Designer.vb	
@@ -39,7 +39,7 @@ Namespace My.Resources
         Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
             Get
                 If Object.ReferenceEquals(resourceMan, Nothing) Then
-                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("Panel_Control.Resources", GetType(Resources).Assembly)
+                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("POGOserver_Control.Resources", GetType(Resources).Assembly)
                     resourceMan = temp
                 End If
                 Return resourceMan
diff --git a/Panel Control/My Project/Resources.resx b/POGOserver Control/My Project/Resources.resx
similarity index 100%
rename from Panel Control/My Project/Resources.resx
rename to POGOserver Control/My Project/Resources.resx
diff --git a/Panel Control/My Project/Settings.Designer.vb b/POGOserver Control/My Project/Settings.Designer.vb
similarity index 94%
rename from Panel Control/My Project/Settings.Designer.vb
rename to POGOserver Control/My Project/Settings.Designer.vb
index 695433a..cfd71db 100644
--- a/Panel Control/My Project/Settings.Designer.vb	
+++ b/POGOserver Control/My Project/Settings.Designer.vb	
@@ -64,9 +64,9 @@ Namespace My
     Friend Module MySettingsProperty
         
         <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
-        Friend ReadOnly Property Settings() As Global.Panel_Control.My.MySettings
+        Friend ReadOnly Property Settings() As Global.POGOserver_Control.My.MySettings
             Get
-                Return Global.Panel_Control.My.MySettings.Default
+                Return Global.POGOserver_Control.My.MySettings.Default
             End Get
         End Property
     End Module
diff --git a/Panel Control/My Project/Settings.settings b/POGOserver Control/My Project/Settings.settings
similarity index 100%
rename from Panel Control/My Project/Settings.settings
rename to POGOserver Control/My Project/Settings.settings
diff --git a/Panel Control/POGOserver Control.vbproj b/POGOserver Control/POGOserver Control.vbproj
similarity index 94%
rename from Panel Control/POGOserver Control.vbproj
rename to POGOserver Control/POGOserver Control.vbproj
index 26711d2..1131e9b 100644
--- a/Panel Control/POGOserver Control.vbproj	
+++ b/POGOserver Control/POGOserver Control.vbproj	
@@ -6,9 +6,9 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{BF7FA37B-9C74-4FA1-9EDE-A88C77BB920D}</ProjectGuid>
     <OutputType>WinExe</OutputType>
-    <StartupObject>Panel_Control.My.MyApplication</StartupObject>
-    <RootNamespace>Panel_Control</RootNamespace>
-    <AssemblyName>Panel Control</AssemblyName>
+    <StartupObject>POGOserver_Control.My.MyApplication</StartupObject>
+    <RootNamespace>POGOserver_Control</RootNamespace>
+    <AssemblyName>POGOserver Control</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>WindowsForms</MyType>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
@@ -21,7 +21,7 @@
     <DefineDebug>true</DefineDebug>
     <DefineTrace>true</DefineTrace>
     <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>Panel Control.xml</DocumentationFile>
+    <DocumentationFile>POGOserver Control.xml</DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -31,7 +31,7 @@
     <DefineTrace>true</DefineTrace>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DocumentationFile>Panel Control.xml</DocumentationFile>
+    <DocumentationFile>POGOserver Control.xml</DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/Panel Control/POGOserver-Main.Designer.vb b/POGOserver Control/POGOserver-Main.Designer.vb
similarity index 100%
rename from Panel Control/POGOserver-Main.Designer.vb
rename to POGOserver Control/POGOserver-Main.Designer.vb
diff --git a/Panel Control/POGOserver-Main.resx b/POGOserver Control/POGOserver-Main.resx
similarity index 100%
rename from Panel Control/POGOserver-Main.resx
rename to POGOserver Control/POGOserver-Main.resx
diff --git a/Panel Control/POGOserver-Main.vb b/POGOserver Control/POGOserver-Main.vb
similarity index 100%
rename from Panel Control/POGOserver-Main.vb
rename to POGOserver Control/POGOserver-Main.vb
diff --git a/Panel Control/POGOserver.ico b/POGOserver Control/POGOserver.ico
similarity index 100%
rename from Panel Control/POGOserver.ico
rename to POGOserver Control/POGOserver.ico
diff --git a/POGOserver.sln b/POGOserver.sln
index 95ebb30..ecfa839 100644
--- a/POGOserver.sln
+++ b/POGOserver.sln
@@ -5,7 +5,7 @@ VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{262852C6-CD72-467D-83FE-5EEB1973A190}") = "POGOserver", "POGOserver.jsproj", "{623ED577-0A06-4A07-A70B-D179FBCCC78D}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "POGOserver Control", "Panel Control\POGOserver Control.vbproj", "{BF7FA37B-9C74-4FA1-9EDE-A88C77BB920D}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "POGOserver Control", "POGOserver Control\POGOserver Control.vbproj", "{BF7FA37B-9C74-4FA1-9EDE-A88C77BB920D}"
 	ProjectSection(ProjectDependencies) = postProject
 		{623ED577-0A06-4A07-A70B-D179FBCCC78D} = {623ED577-0A06-4A07-A70B-D179FBCCC78D}
 	EndProjectSection