diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientStackNetworkHandler.cs b/OpenSim/Region/ClientStack/LindenUDP/ILLClientStackNetworkHandler.cs
similarity index 97%
rename from OpenSim/Region/ClientStack/LindenUDP/LLClientStackNetworkHandler.cs
rename to OpenSim/Region/ClientStack/LindenUDP/ILLClientStackNetworkHandler.cs
index 857ce13471..ebb2c27993 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientStackNetworkHandler.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/ILLClientStackNetworkHandler.cs
@@ -29,10 +29,10 @@ using System.Net.Sockets;
 
 namespace OpenSim.Region.ClientStack.LindenUDP
 {
-    public interface LLClientStackNetworkHandler
+    public interface ILLClientStackNetworkHandler
     {
         void SendPacketTo(byte[] buffer, int size, SocketFlags flags, uint circuitcode); // EndPoint packetSender);
         void RemoveClientCircuit(uint circuitcode);
         void RegisterPacketServer(LLPacketServer server);
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
index 1713755763..12616666e3 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
@@ -39,7 +39,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         //private static readonly log4net.ILog m_log
         //    = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
 
-        protected readonly LLClientStackNetworkHandler m_networkHandler;
+        protected readonly ILLClientStackNetworkHandler m_networkHandler;
         protected IScene m_scene;
 
         //private readonly ClientManager m_clientManager = new ClientManager();
@@ -48,7 +48,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         //    get { return m_clientManager; }
         //}
 
-        public LLPacketServer(LLClientStackNetworkHandler networkHandler)
+        public LLPacketServer(ILLClientStackNetworkHandler networkHandler)
         {
             m_networkHandler = networkHandler;
             m_networkHandler.RegisterPacketServer(this);
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 5c3626d05c..f56c0bfa79 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
     /// <summary>
     /// This class handles the initial UDP circuit setup with a client and passes on subsequent packets to the LLPacketServer
     /// </summary>
-    public class LLUDPServer : LLClientStackNetworkHandler, IClientNetworkServer
+    public class LLUDPServer : ILLClientStackNetworkHandler, IClientNetworkServer
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);