diff --git a/src/Chapter01.Tests/Listing01.21.Tests.cs b/src/Chapter01.Tests/Listing01.21.Tests.cs
index a6227396c..275e3f8d0 100644
--- a/src/Chapter01.Tests/Listing01.21.Tests.cs
+++ b/src/Chapter01.Tests/Listing01.21.Tests.cs
@@ -11,7 +11,7 @@ public void Main_InputInigoMontoya_WriteLastFirst()
 @"Hey you!
 Enter your first name: <<Inigo
 >>Enter your last name: <<Montoya
->>Your full name is Montoya, Inigo.";
+>>Your full name is Inigo Montoya.";
 
         IntelliTect.TestTools.Console.ConsoleAssert.Expect(
             expected, CommentSamples.Main);
diff --git a/src/Chapter01/Listing01.21.CommentingYourCode.cs b/src/Chapter01/Listing01.21.CommentingYourCode.cs
index 510748e5c..58edc08d9 100644
--- a/src/Chapter01/Listing01.21.CommentingYourCode.cs
+++ b/src/Chapter01/Listing01.21.CommentingYourCode.cs
@@ -19,7 +19,7 @@ public static void Main()
         /* Display a greeting to the console 
           using composite formatting. */
 
-        Console.WriteLine("Your full name is {1}, {0}.", 
+        Console.WriteLine("Your full name is {0} {1}.",
             firstName, lastName);
         // This is the end
         // of the program listing