diff --git a/LibreMetaverse.Voice/LibreMetaverse.Voice.csproj b/LibreMetaverse.Voice.Vivox/LibreMetaverse.Voice.Vivox.csproj
similarity index 95%
rename from LibreMetaverse.Voice/LibreMetaverse.Voice.csproj
rename to LibreMetaverse.Voice.Vivox/LibreMetaverse.Voice.Vivox.csproj
index 87c2e877..a56e6a7a 100644
--- a/LibreMetaverse.Voice/LibreMetaverse.Voice.csproj
+++ b/LibreMetaverse.Voice.Vivox/LibreMetaverse.Voice.Vivox.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <AssemblyName>LibreMetaverse.Voice</AssemblyName>
-	<PackageId>LibreMetaverse.Voice</PackageId>
+	<PackageId>LibreMetaverse.Voice.Vivox</PackageId>
 	<Description>Library interface for Vivox voice client</Description>
     <OutputType>Library</OutputType>
     <RootNamespace>LibreMetaverse</RootNamespace>
diff --git a/LibreMetaverse.Voice/TCPPipe.cs b/LibreMetaverse.Voice.Vivox/TCPPipe.cs
similarity index 99%
rename from LibreMetaverse.Voice/TCPPipe.cs
rename to LibreMetaverse.Voice.Vivox/TCPPipe.cs
index 7448c132..0dbefd4c 100644
--- a/LibreMetaverse.Voice/TCPPipe.cs
+++ b/LibreMetaverse.Voice.Vivox/TCPPipe.cs
@@ -30,7 +30,7 @@ using System.Diagnostics;
 using System.Net;
 using System.Net.Sockets;
 
-namespace LibreMetaverse.Voice
+namespace LibreMetaverse.Voice.Vivox
 {
     public class TCPPipe
     {
diff --git a/LibreMetaverse.Voice/VoiceAccount.cs b/LibreMetaverse.Voice.Vivox/VoiceAccount.cs
similarity index 99%
rename from LibreMetaverse.Voice/VoiceAccount.cs
rename to LibreMetaverse.Voice.Vivox/VoiceAccount.cs
index 681c0a22..a0d4ed97 100644
--- a/LibreMetaverse.Voice/VoiceAccount.cs
+++ b/LibreMetaverse.Voice.Vivox/VoiceAccount.cs
@@ -27,7 +27,7 @@
 
 using System.Text;
 
-namespace LibreMetaverse.Voice
+namespace LibreMetaverse.Voice.Vivox
 {
     public partial class VoiceGateway
     {
diff --git a/LibreMetaverse.Voice/VoiceAux.cs b/LibreMetaverse.Voice.Vivox/VoiceAux.cs
similarity index 99%
rename from LibreMetaverse.Voice/VoiceAux.cs
rename to LibreMetaverse.Voice.Vivox/VoiceAux.cs
index f5d9319f..82d79df3 100644
--- a/LibreMetaverse.Voice/VoiceAux.cs
+++ b/LibreMetaverse.Voice.Vivox/VoiceAux.cs
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-namespace LibreMetaverse.Voice
+namespace LibreMetaverse.Voice.Vivox
 {
     public partial class VoiceGateway
     {
diff --git a/LibreMetaverse.Voice/VoiceConnector.cs b/LibreMetaverse.Voice.Vivox/VoiceConnector.cs
similarity index 99%
rename from LibreMetaverse.Voice/VoiceConnector.cs
rename to LibreMetaverse.Voice.Vivox/VoiceConnector.cs
index 2a335d9c..9697d703 100644
--- a/LibreMetaverse.Voice/VoiceConnector.cs
+++ b/LibreMetaverse.Voice.Vivox/VoiceConnector.cs
@@ -27,7 +27,7 @@
 
 using System.Text;
 
-namespace LibreMetaverse.Voice
+namespace LibreMetaverse.Voice.Vivox
 {
     public partial class VoiceGateway
     {
diff --git a/LibreMetaverse.Voice/VoiceControl.cs b/LibreMetaverse.Voice.Vivox/VoiceControl.cs
similarity index 99%
rename from LibreMetaverse.Voice/VoiceControl.cs
rename to LibreMetaverse.Voice.Vivox/VoiceControl.cs
index 79c8bd3d..120bd1d1 100644
--- a/LibreMetaverse.Voice/VoiceControl.cs
+++ b/LibreMetaverse.Voice.Vivox/VoiceControl.cs
@@ -36,7 +36,7 @@ using OpenMetaverse.StructuredData;
 using System.Net.Http;
 using System.Threading.Tasks;
 
-namespace LibreMetaverse.Voice
+namespace LibreMetaverse.Voice.Vivox
 {
     public partial class VoiceGateway : IDisposable
     {
diff --git a/LibreMetaverse.Voice/VoiceDefinitions.cs b/LibreMetaverse.Voice.Vivox/VoiceDefinitions.cs
similarity index 99%
rename from LibreMetaverse.Voice/VoiceDefinitions.cs
rename to LibreMetaverse.Voice.Vivox/VoiceDefinitions.cs
index 5bfdcc0d..e87057b8 100644
--- a/LibreMetaverse.Voice/VoiceDefinitions.cs
+++ b/LibreMetaverse.Voice.Vivox/VoiceDefinitions.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using System.Xml.Serialization;
 using OpenMetaverse;
 
-namespace LibreMetaverse.Voice
+namespace LibreMetaverse.Voice.Vivox
 {
     public partial class VoiceGateway
     {
diff --git a/LibreMetaverse.Voice/VoiceGateway.cs b/LibreMetaverse.Voice.Vivox/VoiceGateway.cs
similarity index 99%
rename from LibreMetaverse.Voice/VoiceGateway.cs
rename to LibreMetaverse.Voice.Vivox/VoiceGateway.cs
index 0374f595..4658a093 100644
--- a/LibreMetaverse.Voice/VoiceGateway.cs
+++ b/LibreMetaverse.Voice.Vivox/VoiceGateway.cs
@@ -34,7 +34,7 @@ using System.Threading;
 using System.Text;
 using OpenMetaverse;
 
-namespace LibreMetaverse.Voice
+namespace LibreMetaverse.Voice.Vivox
 {
     public partial class VoiceGateway
     {
diff --git a/LibreMetaverse.Voice/VoiceManager.cs b/LibreMetaverse.Voice.Vivox/VoiceManager.cs
similarity index 99%
rename from LibreMetaverse.Voice/VoiceManager.cs
rename to LibreMetaverse.Voice.Vivox/VoiceManager.cs
index 5c07f3a4..9386e595 100644
--- a/LibreMetaverse.Voice/VoiceManager.cs
+++ b/LibreMetaverse.Voice.Vivox/VoiceManager.cs
@@ -40,7 +40,7 @@ using OpenMetaverse.Messages.Linden;
 using System.Net.Http;
 using System.Threading.Tasks;
 
-namespace LibreMetaverse.Voice
+namespace LibreMetaverse.Voice.Vivox
 {
     public enum VoiceStatus
     {
@@ -187,7 +187,7 @@ namespace LibreMetaverse.Voice
         {
             if (!_enabled) return false;
 
-            _daemonPipe = new Voice.TCPPipe();
+            _daemonPipe = new TCPPipe();
             _daemonPipe.OnDisconnected += _DaemonPipe_OnDisconnected;
             _daemonPipe.OnReceiveLine += _DaemonPipe_OnReceiveLine;
 
diff --git a/LibreMetaverse.Voice/VoiceManagerBlocking.cs b/LibreMetaverse.Voice.Vivox/VoiceManagerBlocking.cs
similarity index 99%
rename from LibreMetaverse.Voice/VoiceManagerBlocking.cs
rename to LibreMetaverse.Voice.Vivox/VoiceManagerBlocking.cs
index 4f2fd1b8..1b8e66d5 100644
--- a/LibreMetaverse.Voice/VoiceManagerBlocking.cs
+++ b/LibreMetaverse.Voice.Vivox/VoiceManagerBlocking.cs
@@ -28,7 +28,7 @@
 using System.Collections.Generic;
 using System.Threading;
 
-namespace LibreMetaverse.Voice
+namespace LibreMetaverse.Voice.Vivox
 {
     public partial class VoiceManager
     {
diff --git a/LibreMetaverse.Voice/VoiceParticipant.cs b/LibreMetaverse.Voice.Vivox/VoiceParticipant.cs
similarity index 99%
rename from LibreMetaverse.Voice/VoiceParticipant.cs
rename to LibreMetaverse.Voice.Vivox/VoiceParticipant.cs
index d94ec69e..4b6f33b5 100644
--- a/LibreMetaverse.Voice/VoiceParticipant.cs
+++ b/LibreMetaverse.Voice.Vivox/VoiceParticipant.cs
@@ -30,7 +30,7 @@ using System.Text;
 using System.Text.RegularExpressions;
 using OpenMetaverse;
 
-namespace LibreMetaverse.Voice
+namespace LibreMetaverse.Voice.Vivox
 {
     public class VoiceParticipant
     {
diff --git a/LibreMetaverse.Voice/VoiceSession.cs b/LibreMetaverse.Voice.Vivox/VoiceSession.cs
similarity index 99%
rename from LibreMetaverse.Voice/VoiceSession.cs
rename to LibreMetaverse.Voice.Vivox/VoiceSession.cs
index 3cbcff4c..874eec34 100644
--- a/LibreMetaverse.Voice/VoiceSession.cs
+++ b/LibreMetaverse.Voice.Vivox/VoiceSession.cs
@@ -29,7 +29,7 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Text;
 
-namespace LibreMetaverse.Voice
+namespace LibreMetaverse.Voice.Vivox
 {
     /// <summary>
     /// Represents a single Voice Session to the Vivox service.
diff --git a/LibreMetaverse.sln b/LibreMetaverse.sln
index 58d51269..396f3c46 100644
--- a/LibreMetaverse.sln
+++ b/LibreMetaverse.sln
@@ -27,7 +27,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PacketDump", "Programs\exam
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestClient", "Programs\examples\TestClient\TestClient.csproj", "{9F71FDB3-0000-0000-0000-000000000000}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VoiceTest", "Programs\VoiceTest\VoiceTest.csproj", "{EE4EA934-0000-0000-0000-000000000000}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VivoxTest", "Programs\VivoxTest\VivoxTest.csproj", "{EE4EA934-0000-0000-0000-000000000000}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibreMetaverse.PrimMesher", "PrimMesher\LibreMetaverse.PrimMesher.csproj", "{2E2B643F-F18B-4791-BA4B-6E82D0E794B6}"
 EndProject
@@ -43,7 +43,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibreMetaverse.LslTools", "LibreMetaverse.LslTools\LibreMetaverse.LslTools.csproj", "{989E5E15-D99B-4CF1-AF64-90C568FC979A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibreMetaverse.Voice", "LibreMetaverse.Voice\LibreMetaverse.Voice.csproj", "{FB07C6DE-F791-4336-B6E2-B32EEAC34792}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibreMetaverse.Voice.Vivox", "LibreMetaverse.Voice.Vivox\LibreMetaverse.Voice.Vivox.csproj", "{FB07C6DE-F791-4336-B6E2-B32EEAC34792}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Programs/VoiceTest/VoiceTest.csproj b/Programs/VivoxTest/VivoxTest.csproj
similarity index 83%
rename from Programs/VoiceTest/VoiceTest.csproj
rename to Programs/VivoxTest/VivoxTest.csproj
index dfebaa86..9f93f455 100644
--- a/Programs/VoiceTest/VoiceTest.csproj
+++ b/Programs/VivoxTest/VivoxTest.csproj
@@ -1,12 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-	<AssemblyName>VoiceTest</AssemblyName>
 	<OutputType>Exe</OutputType>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <OutputPath>..\..\bin\</OutputPath>
     <TargetFrameworks>net481;net7.0;net8.0</TargetFrameworks>
     <PlatformTarget>AnyCPU</PlatformTarget>
 	<IsPackable>false</IsPackable>
+	<PackageId>VivoxTest</PackageId>
+	<RootNamespace>VoiceTest</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
@@ -14,7 +15,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\LibreMetaverse\LibreMetaverse.csproj" />
 	<ProjectReference Include="..\..\LibreMetaverse.Types\LibreMetaverse.Types.csproj" />
-    <ProjectReference Include="..\..\LibreMetaverse.Voice\LibreMetaverse.Voice.csproj" />
+    <ProjectReference Include="..\..\LibreMetaverse.Voice.Vivox\LibreMetaverse.Voice.Vivox.csproj" />
   </ItemGroup>
   <ItemGroup>
 	<None Include="..\..\LICENSE.txt" Pack="true" PackagePath="\" />
diff --git a/Programs/VoiceTest/VoiceTest.cs b/Programs/VivoxTest/VoiceTest.cs
similarity index 96%
rename from Programs/VoiceTest/VoiceTest.cs
rename to Programs/VivoxTest/VoiceTest.cs
index 01596483..4ae7408e 100644
--- a/Programs/VoiceTest/VoiceTest.cs
+++ b/Programs/VivoxTest/VoiceTest.cs
@@ -28,7 +28,7 @@ using System;
 using System.Collections.Generic;
 using System.Threading;
 using OpenMetaverse;
-using LibreMetaverse.Voice;
+using LibreMetaverse.Voice.Vivox;
 
 namespace VoiceTest
 {
@@ -62,7 +62,7 @@ namespace VoiceTest
         {
             if (args.Length < 3)
             {
-                Console.WriteLine("Usage: VoiceTest.exe [firstname] [lastname] [password]");
+                Console.WriteLine("Usage: VivoxTest.exe [firstname] [lastname] [password]");
                 return;
             }
 
diff --git a/Programs/examples/TestClient/TestClient.cs b/Programs/examples/TestClient/TestClient.cs
index 212f404e..3fefc638 100644
--- a/Programs/examples/TestClient/TestClient.cs
+++ b/Programs/examples/TestClient/TestClient.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Reflection;
 using OpenMetaverse.Packets;
-using LibreMetaverse.Voice;
+using LibreMetaverse.Voice.Vivox;
 
 namespace OpenMetaverse.TestClient
 {
diff --git a/Programs/examples/TestClient/TestClient.csproj b/Programs/examples/TestClient/TestClient.csproj
index 8d5eadc7..ea42c4ca 100644
--- a/Programs/examples/TestClient/TestClient.csproj
+++ b/Programs/examples/TestClient/TestClient.csproj
@@ -13,7 +13,7 @@
     <ProjectReference Include="..\..\..\LibreMetaverse\LibreMetaverse.csproj" />
     <ProjectReference Include="..\..\..\LibreMetaverse.StructuredData\LibreMetaverse.StructuredData.csproj" />
     <ProjectReference Include="..\..\..\LibreMetaverse.Types\LibreMetaverse.Types.csproj" />
-    <ProjectReference Include="..\..\..\LibreMetaverse.Voice\LibreMetaverse.Voice.csproj" />
+    <ProjectReference Include="..\..\..\LibreMetaverse.Voice.Vivox\LibreMetaverse.Voice.Vivox.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Pfim" Version="0.11.2" />