diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 2e128a708a..c416e88131 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -2243,7 +2243,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             Scene scene = null;
             GetSceneFromRegionParams(requestData, responseData, out scene);
 
-            IMapTileModule mapTileModule = scene.RequestModuleInterface<IMapTileModule>();
+            IMapImageUploadModule mapTileModule = scene.RequestModuleInterface<IMapImageUploadModule>();
             if (mapTileModule != null)
             {
                 Util.FireAndForget((x) =>
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
index 3ed756adf7..2c17e0e309 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
     /// </remarks>
 
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "MapImageServiceModule")]
-    public class MapImageServiceModule :  ISharedRegionModule, IMapTileModule
+    public class MapImageServiceModule : ISharedRegionModule, IMapImageUploadModule
     {
         private static readonly ILog m_log =
             LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -147,7 +147,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
             // v2 Map generation on startup is now handled by scene to allow bmp to be shared with
             // v1 service and not generate map tiles twice as was previous behavior
             //scene.EventManager.OnRegionReadyStatusChange += s => { if (s.Ready) UploadMapTile(s); };
-            scene.RegisterModuleInterface<IMapTileModule>(this);
+            scene.RegisterModuleInterface<IMapImageUploadModule>(this);
         }
 
         ///<summary>
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index 1bbd9feed8..1f8f6b0d72 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -73,7 +73,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
         private Dictionary<UUID, Queue<MapBlockRequestData>> m_mapBlockRequests = new Dictionary<UUID, Queue<MapBlockRequestData>>();
 
         private IMapImageGenerator m_mapImageGenerator;
-        private IMapTileModule m_mapImageServiceModule;
+        private IMapImageUploadModule m_mapImageServiceModule;
 
         protected Scene m_scene;
         private List<MapBlockData> cachedMapBlocks = new List<MapBlockData>();
@@ -146,7 +146,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 return;
 
             m_mapImageGenerator = m_scene.RequestModuleInterface<IMapImageGenerator>();
-            m_mapImageServiceModule = m_scene.RequestModuleInterface<IMapTileModule>();
+            m_mapImageServiceModule = m_scene.RequestModuleInterface<IMapImageUploadModule>();
         }
 
 
@@ -1133,7 +1133,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 block.X = (ushort)minX;
                 block.Y = (ushort)minY;
                 block.MapImageId = UUID.Zero;
-                block.Access = (byte)SimAccess.Down; // means 'simulator is offline'
+                block.Access = (byte)SimAccess.NonExistent;
                 allBlocks.Add(block);
                 mapBlocks.Add(block);
                 remoteClient.SendMapBlock(mapBlocks, flag & 0xffff);
diff --git a/OpenSim/Region/Framework/Interfaces/IMapTileModule.cs b/OpenSim/Region/Framework/Interfaces/IMapImageUploadModule.cs
similarity index 97%
rename from OpenSim/Region/Framework/Interfaces/IMapTileModule.cs
rename to OpenSim/Region/Framework/Interfaces/IMapImageUploadModule.cs
index 857d9238b3..5151567c6e 100644
--- a/OpenSim/Region/Framework/Interfaces/IMapTileModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IMapImageUploadModule.cs
@@ -31,7 +31,7 @@ using System.Drawing;
 
 namespace OpenSim.Region.Framework.Interfaces
 {
-    public interface IMapTileModule
+    public interface IMapImageUploadModule
     {
         /// <summary>
         /// Upload a new maptile