diff --git a/OpenSim/Grid/GridServer/Main.cs b/OpenSim/Grid/GridServer/GridServerBase.cs
similarity index 98%
rename from OpenSim/Grid/GridServer/Main.cs
rename to OpenSim/Grid/GridServer/GridServerBase.cs
index 5d21750ec9..592883ae3e 100644
--- a/OpenSim/Grid/GridServer/Main.cs
+++ b/OpenSim/Grid/GridServer/GridServerBase.cs
@@ -37,7 +37,7 @@ namespace OpenSim.Grid.GridServer
 {
     /// <summary>
     /// </summary>
-    public class OpenGrid_Main : BaseOpenSimServer, conscmd_callback
+    public class GridServerBase : BaseOpenSimServer, conscmd_callback
     {
         private GridConfig m_config;
         private GridManager m_gridManager;
@@ -52,7 +52,7 @@ namespace OpenSim.Grid.GridServer
             }
         }
 
-        public OpenGrid_Main( )
+        public GridServerBase( )
         {
             m_console = new ConsoleBase("OpenGrid", this);
             MainConsole.Instance = m_console;
diff --git a/OpenSim/Grid/GridServer/Program.cs b/OpenSim/Grid/GridServer/Program.cs
index 7247a6366e..8ca04df470 100644
--- a/OpenSim/Grid/GridServer/Program.cs
+++ b/OpenSim/Grid/GridServer/Program.cs
@@ -12,7 +12,7 @@ namespace OpenSim.Grid.GridServer
         {
             log4net.Config.XmlConfigurator.Configure();
 
-            OpenGrid_Main app = new OpenGrid_Main();
+            GridServerBase app = new GridServerBase();
 
             if (args.Length > 0 && args[0] == "-setuponly")
             {