diff --git a/CodexNetDeployer/CodexNodeStarter.cs b/CodexNetDeployer/CodexNodeStarter.cs
index 1bc4af9..8e861f3 100644
--- a/CodexNetDeployer/CodexNodeStarter.cs
+++ b/CodexNetDeployer/CodexNodeStarter.cs
@@ -28,6 +28,7 @@ namespace CodexNetDeployer
             var workflowStartup = new StartupConfig();
             workflowStartup.Add(gethResult);
             workflowStartup.Add(CreateCodexStartupConfig(bootstrapSpr, i, validatorsLeft));
+            workflowStartup.NameOverride = GetCodexContainerName(i);
 
             var containers = workflow.Start(1, Location.Unspecified, new CodexContainerRecipe(), workflowStartup);
 
@@ -75,6 +76,12 @@ namespace CodexNetDeployer
             return null;
         }
 
+        private string GetCodexContainerName(int i)
+        {
+            if (i == 0) return "BOOTSTRAP";
+            return "CODEX" + i;
+        }
+
         private CodexStartupConfig CreateCodexStartupConfig(string bootstrapSpr, int i, int validatorsLeft)
         {
             var codexStart = new CodexStartupConfig(config.CodexLogLevel);
diff --git a/ContinuousTests/Tests/PeersTest.cs b/ContinuousTests/Tests/PeersTest.cs
index 978c31c..5726cff 100644
--- a/ContinuousTests/Tests/PeersTest.cs
+++ b/ContinuousTests/Tests/PeersTest.cs
@@ -24,6 +24,7 @@ namespace ContinuousTests.Tests
             {
                 var info = n.GetDebugInfo();
                 Log.Log($"{n.GetName()} = {info.table.localNode.nodeId}");
+                Log.AddStringReplace(info.table.localNode.nodeId, n.GetName());
                 return info;
             }).ToArray();
 
@@ -45,7 +46,9 @@ namespace ContinuousTests.Tests
             if (!expected.All(ex => known.Contains(ex)))
             {
                 var nl = Environment.NewLine;
-                return $"Not all of{nl}'{string.Join(",", expected)}'{nl}were present in routing table:{nl}'{string.Join(",", known)}'";
+                return $"{nl}At node '{info.table.localNode.nodeId}'{nl}" +
+                    $"Not all of{nl}'{string.Join(",", expected)}'{nl}" +
+                    $"were present in routing table:{nl}'{string.Join(",", known)}'";
             }
 
             return string.Empty;