diff --git a/src/Vlingo.Actors.Tests/ActorProxyBaseTest.cs b/src/Vlingo.Actors.Tests/ActorProxyBaseTest.cs
index 5d70fc4c..19b09aa8 100644
--- a/src/Vlingo.Actors.Tests/ActorProxyBaseTest.cs
+++ b/src/Vlingo.Actors.Tests/ActorProxyBaseTest.cs
@@ -7,7 +7,7 @@
 
 using System;
 using Newtonsoft.Json;
-using Vlingo.Common.Serialization;
+using Vlingo.Xoom.Common.Serialization;
 using Xunit;
 
 namespace Vlingo.Actors.Tests
diff --git a/src/Vlingo.Actors/ActorProxy.cs b/src/Vlingo.Actors/ActorProxy.cs
index c2e04e91..6de3c4e2 100644
--- a/src/Vlingo.Actors/ActorProxy.cs
+++ b/src/Vlingo.Actors/ActorProxy.cs
@@ -9,8 +9,8 @@
 using System.Linq;
 using System.Reflection;
 using System.Runtime.CompilerServices;
-using Vlingo.Common.Compiler;
-using static Vlingo.Common.Compiler.DynaNaming;
+using Vlingo.Xoom.Common.Compiler;
+using static Vlingo.Xoom.Common.Compiler.DynaNaming;
 
 namespace Vlingo.Actors
 {
diff --git a/src/Vlingo.Actors/Plugin/Supervision/ConfiguredSupervisor.cs b/src/Vlingo.Actors/Plugin/Supervision/ConfiguredSupervisor.cs
index 491fc9e3..a281c1be 100644
--- a/src/Vlingo.Actors/Plugin/Supervision/ConfiguredSupervisor.cs
+++ b/src/Vlingo.Actors/Plugin/Supervision/ConfiguredSupervisor.cs
@@ -6,7 +6,7 @@
 // one at https://mozilla.org/MPL/2.0/.
 
 using System;
-using Vlingo.Common.Compiler;
+using Vlingo.Xoom.Common.Compiler;
 
 namespace Vlingo.Actors.Plugin.Supervision
 {
diff --git a/src/Vlingo.Actors/ProxyGenerator.cs b/src/Vlingo.Actors/ProxyGenerator.cs
index ee2b324f..54ce66e4 100644
--- a/src/Vlingo.Actors/ProxyGenerator.cs
+++ b/src/Vlingo.Actors/ProxyGenerator.cs
@@ -150,7 +150,7 @@ private string ImportStatements()
             namespaces.Add("System.Collections.Generic");
             namespaces.Add("System.Threading.Tasks");
             namespaces.Add(typeof(Actor).Namespace!);
-            namespaces.Add(typeof(AtomicBoolean).Namespace!); // Vlingo.Common
+            namespaces.Add(typeof(AtomicBoolean).Namespace!); // Vlingo.Xoom.Common
 
             return string.Join("\n", namespaces.Select(x => $"using {x};"));
             
diff --git a/src/Vlingo.Actors/Scheduled__Proxy.cs b/src/Vlingo.Actors/Scheduled__Proxy.cs
index 90c22be9..d6d556c2 100644
--- a/src/Vlingo.Actors/Scheduled__Proxy.cs
+++ b/src/Vlingo.Actors/Scheduled__Proxy.cs
@@ -1,12 +1,11 @@
 using System;
 using Vlingo.Actors;
-using Vlingo.Xoom.Common;
 
-namespace Vlingo.Common
+namespace Vlingo.Xoom.Common
 {
     public class Scheduled__Proxy<T> : IScheduled<T>
     {
-        private const string IntervalSignalRepresentation1 = "IntervalSignal(Vlingo.Common.IScheduled<T>, T)";
+        private const string IntervalSignalRepresentation1 = "IntervalSignal(Vlingo.Xoom.Common.IScheduled<T>, T)";
 
         private readonly Actor _actor;
         private readonly IMailbox _mailbox;