diff --git a/OpenSim/Addons/os-webrtc-janus/Janus/BHasher.cs b/OpenSim/Addons/os-webrtc-janus/Janus/BHasher.cs
index fc10f48215..23b27f54e6 100644
--- a/OpenSim/Addons/os-webrtc-janus/Janus/BHasher.cs
+++ b/OpenSim/Addons/os-webrtc-janus/Janus/BHasher.cs
@@ -31,7 +31,7 @@ using System.Linq;
 using System.Text;
 using System.Security.Cryptography;
 
-namespace WebRtcVoice
+namespace osWebRtcVoice
 {
 
     // There are several different hashing systems ranging from int's to SHA versions.
diff --git a/OpenSim/Addons/os-webrtc-janus/Janus/JanusAudioBridge.cs b/OpenSim/Addons/os-webrtc-janus/Janus/JanusAudioBridge.cs
index 4885648b4a..05adbd89c1 100644
--- a/OpenSim/Addons/os-webrtc-janus/Janus/JanusAudioBridge.cs
+++ b/OpenSim/Addons/os-webrtc-janus/Janus/JanusAudioBridge.cs
@@ -32,7 +32,7 @@ using System.Threading.Tasks;
 
 using log4net;
 
-namespace WebRtcVoice
+namespace osWebRtcVoice
 {
     // Encapsulization of a Session to the Janus server
     public class JanusAudioBridge : JanusPlugin
diff --git a/OpenSim/Addons/os-webrtc-janus/Janus/JanusMessages.cs b/OpenSim/Addons/os-webrtc-janus/Janus/JanusMessages.cs
index e441897ec9..8daefafc67 100644
--- a/OpenSim/Addons/os-webrtc-janus/Janus/JanusMessages.cs
+++ b/OpenSim/Addons/os-webrtc-janus/Janus/JanusMessages.cs
@@ -33,7 +33,7 @@ using OpenMetaverse;
 
 using log4net;
 
-namespace WebRtcVoice
+namespace osWebRtcVoice
 {
 
     /// <summary>
diff --git a/OpenSim/Addons/os-webrtc-janus/Janus/JanusPlugin.cs b/OpenSim/Addons/os-webrtc-janus/Janus/JanusPlugin.cs
index dd2a5033f2..eabca6393f 100644
--- a/OpenSim/Addons/os-webrtc-janus/Janus/JanusPlugin.cs
+++ b/OpenSim/Addons/os-webrtc-janus/Janus/JanusPlugin.cs
@@ -39,7 +39,7 @@ using OpenMetaverse;
 using Nini.Config;
 using log4net;
 
-namespace WebRtcVoice
+namespace osWebRtcVoice
 {
     // Encapsulization of a Session to the Janus server
     public class JanusPlugin : IDisposable
diff --git a/OpenSim/Addons/os-webrtc-janus/Janus/JanusRoom.cs b/OpenSim/Addons/os-webrtc-janus/Janus/JanusRoom.cs
index 202db3bd11..7a76f11b19 100644
--- a/OpenSim/Addons/os-webrtc-janus/Janus/JanusRoom.cs
+++ b/OpenSim/Addons/os-webrtc-janus/Janus/JanusRoom.cs
@@ -41,7 +41,7 @@ using System.Threading.Tasks;
 using System.Text.RegularExpressions;
 using System.Collections.Generic;
 
-namespace WebRtcVoice
+namespace osWebRtcVoice
 {
     // Encapsulization of a Session to the Janus server
     public class JanusRoom : IDisposable
diff --git a/OpenSim/Addons/os-webrtc-janus/Janus/JanusSession.cs b/OpenSim/Addons/os-webrtc-janus/Janus/JanusSession.cs
index 686604717b..a26c9bcd08 100644
--- a/OpenSim/Addons/os-webrtc-janus/Janus/JanusSession.cs
+++ b/OpenSim/Addons/os-webrtc-janus/Janus/JanusSession.cs
@@ -39,7 +39,7 @@ using log4net.Core;
 using System.Reflection.Metadata;
 using System.Threading;
 
-namespace WebRtcVoice
+namespace osWebRtcVoice
 {
     // Encapsulization of a Session to the Janus server
     public class JanusSession : IDisposable
diff --git a/OpenSim/Addons/os-webrtc-janus/Janus/JanusViewerSession.cs b/OpenSim/Addons/os-webrtc-janus/Janus/JanusViewerSession.cs
index d62f307c1e..3bd187cc98 100644
--- a/OpenSim/Addons/os-webrtc-janus/Janus/JanusViewerSession.cs
+++ b/OpenSim/Addons/os-webrtc-janus/Janus/JanusViewerSession.cs
@@ -33,7 +33,7 @@ using OpenMetaverse.StructuredData;
 
 using log4net;
 
-namespace WebRtcVoice
+namespace osWebRtcVoice
 {
     public class JanusViewerSession : IVoiceViewerSession
     {
diff --git a/OpenSim/Addons/os-webrtc-janus/Janus/WebRtcJanusService.cs b/OpenSim/Addons/os-webrtc-janus/Janus/WebRtcJanusService.cs
index e4ead64480..ce63a72534 100644
--- a/OpenSim/Addons/os-webrtc-janus/Janus/WebRtcJanusService.cs
+++ b/OpenSim/Addons/os-webrtc-janus/Janus/WebRtcJanusService.cs
@@ -38,7 +38,7 @@ using OpenMetaverse;
 using Nini.Config;
 using log4net;
 
-namespace WebRtcVoice
+namespace osWebRtcVoice
 {
     public class WebRtcJanusService : ServiceBase, IWebRtcVoiceService
     {
diff --git a/OpenSim/Addons/os-webrtc-janus/WebRtcVoice/IVoiceViewerSession.cs b/OpenSim/Addons/os-webrtc-janus/WebRtcVoice/IVoiceViewerSession.cs
index fd955ebfc8..92d61f8048 100644
--- a/OpenSim/Addons/os-webrtc-janus/WebRtcVoice/IVoiceViewerSession.cs
+++ b/OpenSim/Addons/os-webrtc-janus/WebRtcVoice/IVoiceViewerSession.cs
@@ -29,7 +29,7 @@ using System.Threading.Tasks;
 
 using OMV = OpenMetaverse;
 
-namespace WebRtcVoice
+namespace osWebRtcVoice
 {
     /// <summary>
     /// This is the interface for the viewer session. It is used to store the
diff --git a/OpenSim/Addons/os-webrtc-janus/WebRtcVoice/IWebRtcVoiceService.cs b/OpenSim/Addons/os-webrtc-janus/WebRtcVoice/IWebRtcVoiceService.cs
index c24f231fb2..ff2fab508d 100644
--- a/OpenSim/Addons/os-webrtc-janus/WebRtcVoice/IWebRtcVoiceService.cs
+++ b/OpenSim/Addons/os-webrtc-janus/WebRtcVoice/IWebRtcVoiceService.cs
@@ -31,7 +31,7 @@ using OpenMetaverse;
 using OpenMetaverse.StructuredData;
 using System.Threading.Tasks;
 
-namespace WebRtcVoice
+namespace osWebRtcVoice
 {
     /// <summary>
     /// This is the interface for the voice service. It is used to connect
diff --git a/OpenSim/Addons/os-webrtc-janus/WebRtcVoice/VoiceViewerSession.cs b/OpenSim/Addons/os-webrtc-janus/WebRtcVoice/VoiceViewerSession.cs
index 7d36bd3023..d31cc54b28 100644
--- a/OpenSim/Addons/os-webrtc-janus/WebRtcVoice/VoiceViewerSession.cs
+++ b/OpenSim/Addons/os-webrtc-janus/WebRtcVoice/VoiceViewerSession.cs
@@ -31,7 +31,7 @@ using System.Collections.Generic;
 using OpenMetaverse;
 using System.Threading.Tasks;
 
-namespace WebRtcVoice
+namespace osWebRtcVoice
 {
     public class VoiceViewerSession : IVoiceViewerSession
     {
diff --git a/OpenSim/Addons/os-webrtc-janus/WebRtcVoice/WebRtcVoiceServerConnector.cs b/OpenSim/Addons/os-webrtc-janus/WebRtcVoice/WebRtcVoiceServerConnector.cs
index 74e3dcbecf..8f5d7b0926 100644
--- a/OpenSim/Addons/os-webrtc-janus/WebRtcVoice/WebRtcVoiceServerConnector.cs
+++ b/OpenSim/Addons/os-webrtc-janus/WebRtcVoice/WebRtcVoiceServerConnector.cs
@@ -26,7 +26,6 @@
  */
 
 using System;
-using System.Net;
 using System.Reflection;
 
 using OpenSim.Framework;
@@ -43,7 +42,7 @@ using OpenMetaverse.StructuredData;
 using log4net;
 using Nini.Config;
 
-namespace WebRtcVoice
+namespace osWebRtcVoice
 {
     // Class that provides the network interface to the WebRTC voice server.
     // This is used by the Robust server to receive requests from the region servers
diff --git a/OpenSim/Addons/os-webrtc-janus/WebRtcVoice/WebRtcVoiceServiceConnector.cs b/OpenSim/Addons/os-webrtc-janus/WebRtcVoice/WebRtcVoiceServiceConnector.cs
index 6812401c76..cb134d3059 100644
--- a/OpenSim/Addons/os-webrtc-janus/WebRtcVoice/WebRtcVoiceServiceConnector.cs
+++ b/OpenSim/Addons/os-webrtc-janus/WebRtcVoice/WebRtcVoiceServiceConnector.cs
@@ -38,7 +38,7 @@ using log4net;
 using Nini.Config;
 using OSHttpServer;
 
-namespace WebRtcVoice
+namespace osWebRtcVoice
 {
     // Class that provides the local IWebRtcVoiceService interface to the JsonRPC Robust
     //     server. This is used by the region servers to talk to the Robust server.
diff --git a/OpenSim/Addons/os-webrtc-janus/WebRtcVoiceRegionModule/WebRtcVoiceRegionModule.cs b/OpenSim/Addons/os-webrtc-janus/WebRtcVoiceRegionModule/WebRtcVoiceRegionModule.cs
index d0257f585b..2f4b7581fc 100644
--- a/OpenSim/Addons/os-webrtc-janus/WebRtcVoiceRegionModule/WebRtcVoiceRegionModule.cs
+++ b/OpenSim/Addons/os-webrtc-janus/WebRtcVoiceRegionModule/WebRtcVoiceRegionModule.cs
@@ -50,7 +50,7 @@ using Nini.Config;
 [assembly: Addin("WebRtcVoiceRegionModule", "1.0")]
 [assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)]
 
-namespace WebRtcVoice
+namespace osWebRtcVoice
 {
     /// <summary>
     /// This module provides the WebRTC voice interface for viewer clients..
diff --git a/OpenSim/Addons/os-webrtc-janus/WebRtcVoiceServiceModule/WebRtcVoiceServiceModule.cs b/OpenSim/Addons/os-webrtc-janus/WebRtcVoiceServiceModule/WebRtcVoiceServiceModule.cs
index f3a44fe67b..dbad8e0952 100644
--- a/OpenSim/Addons/os-webrtc-janus/WebRtcVoiceServiceModule/WebRtcVoiceServiceModule.cs
+++ b/OpenSim/Addons/os-webrtc-janus/WebRtcVoiceServiceModule/WebRtcVoiceServiceModule.cs
@@ -47,7 +47,7 @@ using Nini.Config;
 [assembly: Addin("WebRtcVoiceServiceModule", "1.0")]
 [assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)]
 
-namespace WebRtcVoice
+namespace osWebRtcVoice
 {
     /// <summary>
     /// Interface for the WebRtcVoiceService.