diff --git a/source2/Compiler/Cosmos.Compiler.DebugStub/CmdSend.cs b/source2/Compiler/Cosmos.Compiler.DebugStub/CmdSend.cs
index 4d4dcb524..d518caac2 100644
--- a/source2/Compiler/Cosmos.Compiler.DebugStub/CmdSend.cs
+++ b/source2/Compiler/Cosmos.Compiler.DebugStub/CmdSend.cs
@@ -21,7 +21,7 @@ namespace Cosmos.Debug.DebugStub {
 			new LiteralAssemblerCode("Call DebugStub_ComWrite32");
 			new LiteralAssemblerCode("DebugStub_SendRegisters_Exit:");
 			new LiteralAssemblerCode("Ret");
-			new LiteralAssemblerCode("DebugStub_SendFrame2:");
+			new LiteralAssemblerCode("DebugStub_SendFrame:");
 			new LiteralAssemblerCode("Mov AL, DebugStub_Const_Ds2Vs_Frame");
 			new LiteralAssemblerCode("Call DebugStub_ComWriteAL");
 			new LiteralAssemblerCode("Mov EAX, 32");
@@ -30,9 +30,9 @@ namespace Cosmos.Debug.DebugStub {
 			new LiteralAssemblerCode("Add ESI, 8");
 			new LiteralAssemblerCode("Mov ECX, 32");
 			new LiteralAssemblerCode("Call DebugStub_ComWriteX");
-			new LiteralAssemblerCode("DebugStub_SendFrame2_Exit:");
+			new LiteralAssemblerCode("DebugStub_SendFrame_Exit:");
 			new LiteralAssemblerCode("Ret");
-			new LiteralAssemblerCode("DebugStub_SendStack2:");
+			new LiteralAssemblerCode("DebugStub_SendStack:");
 			new LiteralAssemblerCode("Mov AL, DebugStub_Const_Ds2Vs_Stack");
 			new LiteralAssemblerCode("Call DebugStub_ComWriteAL");
 			new LiteralAssemblerCode("Mov ESI, [DebugStub_CallerESP]");
@@ -40,12 +40,12 @@ namespace Cosmos.Debug.DebugStub {
 			new LiteralAssemblerCode("Sub EAX, ESI");
 			new LiteralAssemblerCode("Call DebugStub_ComWriteAX");
 			new LiteralAssemblerCode("Mov ESI, [DebugStub_CallerESP]");
-			new LiteralAssemblerCode("DebugStub_SendStack2_SendByte:");
+			new LiteralAssemblerCode("DebugStub_SendStack_SendByte:");
 			new LiteralAssemblerCode("Cmp ESI, [DebugStub_CallerEBP]");
-			new LiteralAssemblerCode("JE DebugStub_SendStack2_Exit");
+			new LiteralAssemblerCode("JE DebugStub_SendStack_Exit");
 			new LiteralAssemblerCode("Call DebugStub_ComWrite8");
-			new LiteralAssemblerCode("Jmp DebugStub_SendStack2_SendByte");
-			new LiteralAssemblerCode("DebugStub_SendStack2_Exit:");
+			new LiteralAssemblerCode("Jmp DebugStub_SendStack_SendByte");
+			new LiteralAssemblerCode("DebugStub_SendStack_Exit:");
 			new LiteralAssemblerCode("Ret");
 			new LiteralAssemblerCode("DebugStub_SendMethodContext2:");
 			new LiteralAssemblerCode("Mov AL, DebugStub_Const_Ds2Vs_MethodContext");
diff --git a/source2/Compiler/Cosmos.Compiler.DebugStub/CmdSend.xs b/source2/Compiler/Cosmos.Compiler.DebugStub/CmdSend.xs
index e2386b40a..75af59d43 100644
--- a/source2/Compiler/Cosmos.Compiler.DebugStub/CmdSend.xs
+++ b/source2/Compiler/Cosmos.Compiler.DebugStub/CmdSend.xs
@@ -16,7 +16,7 @@ procedure SendRegisters {
     ComWrite32()
 }
 
-procedure SendFrame2 {
+procedure SendFrame {
     AL = #Ds2Vs_Frame
     ComWriteAL()
 
@@ -30,7 +30,7 @@ procedure SendFrame2 {
     ComWriteX()
 }
 
-procedure SendStack2 {
+procedure SendStack {
     AL = #Ds2Vs_Stack
     ComWriteAL()
 
diff --git a/source2/Compiler/Cosmos.Compiler.DebugStub/Old/CmdSend.cs b/source2/Compiler/Cosmos.Compiler.DebugStub/Old/CmdSend.cs
index 161fb876d..74430cc93 100644
--- a/source2/Compiler/Cosmos.Compiler.DebugStub/Old/CmdSend.cs
+++ b/source2/Compiler/Cosmos.Compiler.DebugStub/Old/CmdSend.cs
@@ -9,7 +9,7 @@ using Cosmos.Assembler.XSharp;
 
 namespace Cosmos.Debug.DebugStub {
   public partial class DebugStub : CodeGroup {
-    public class SendFrame : CodeBlock {
+    public class SendFrameOld : CodeBlock {
       public override void Assemble() {
         AL = (int)Ds2Vs.Frame;
         Call("DebugStub_ComWriteAL");
@@ -24,7 +24,7 @@ namespace Cosmos.Debug.DebugStub {
       }
     }
 
-    public class SendStack : CodeBlock {
+    public class SendStackOld : CodeBlock {
       public override void Assemble() {
         AL = (int)Ds2Vs.Stack;
         Call("DebugStub_ComWriteAL");