diff --git a/src/Chapter18.Tests/Listing18.25a..GenericAttributes.Tests.cs b/src/Chapter18.Tests/Listing18.26.GenericException.Tests.cs
similarity index 85%
rename from src/Chapter18.Tests/Listing18.25a..GenericAttributes.Tests.cs
rename to src/Chapter18.Tests/Listing18.26.GenericException.Tests.cs
index a702ff245..79dd1a8e6 100644
--- a/src/Chapter18.Tests/Listing18.25a..GenericAttributes.Tests.cs
+++ b/src/Chapter18.Tests/Listing18.26.GenericException.Tests.cs
@@ -1,6 +1,6 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_25a.Tests;
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_26.Tests;
 
 #if NET7_0_OR_GREATER
 [TestClass]
@@ -21,4 +21,4 @@ public void ExpectedExceptionIsNotThrown()
             () => { });
     }
 }
-#endif // NET7_0_OR_GREATER
\ No newline at end of file
+#endif // NET7_0_OR_GREATER
diff --git a/src/Chapter18.Tests/Listing18.25b..CallerArgumentExpression.Tests.cs b/src/Chapter18.Tests/Listing18.27.CallerArgumentExpression.Tests.cs
similarity index 94%
rename from src/Chapter18.Tests/Listing18.25b..CallerArgumentExpression.Tests.cs
rename to src/Chapter18.Tests/Listing18.27.CallerArgumentExpression.Tests.cs
index 718792d8b..254ee6d59 100644
--- a/src/Chapter18.Tests/Listing18.25b..CallerArgumentExpression.Tests.cs
+++ b/src/Chapter18.Tests/Listing18.27.CallerArgumentExpression.Tests.cs
@@ -1,6 +1,6 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_25b.Tests;
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_27.Tests;
 
 #if NET7_0_OR_GREATER
 [TestClass]
@@ -58,4 +58,4 @@ public void ExpectedExceptionIsNotThrown()
             () => { });
     }
 }
-#endif // NET7_0_OR_GREATER
\ No newline at end of file
+#endif // NET7_0_OR_GREATER
diff --git a/src/Chapter18.Tests/Listing18.26.Tests.cs b/src/Chapter18.Tests/Listing18.28.DynamicProgrammingUsingReflection.Tests.cs
similarity index 83%
rename from src/Chapter18.Tests/Listing18.26.Tests.cs
rename to src/Chapter18.Tests/Listing18.28.DynamicProgrammingUsingReflection.Tests.cs
index c69f6f1eb..9a866d020 100644
--- a/src/Chapter18.Tests/Listing18.26.Tests.cs
+++ b/src/Chapter18.Tests/Listing18.28.DynamicProgrammingUsingReflection.Tests.cs
@@ -1,6 +1,6 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_26.Tests;
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_28.Tests;
 
 [TestClass]
 public class ProgramTests
@@ -14,4 +14,4 @@ public void MainTest()
         IntelliTect.TestTools.Console.ConsoleAssert.Expect(
             expected, Program.Main);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Chapter18.Tests/Listing18.27.Tests.cs b/src/Chapter18.Tests/Listing18.29.RuntimeBindingToXMLElementsWithoutDynamic.Tests.cs
similarity index 81%
rename from src/Chapter18.Tests/Listing18.27.Tests.cs
rename to src/Chapter18.Tests/Listing18.29.RuntimeBindingToXMLElementsWithoutDynamic.Tests.cs
index 43f414d43..8316cfc9d 100644
--- a/src/Chapter18.Tests/Listing18.27.Tests.cs
+++ b/src/Chapter18.Tests/Listing18.29.RuntimeBindingToXMLElementsWithoutDynamic.Tests.cs
@@ -1,6 +1,6 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_27.Tests;
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_29.Tests;
 
 [TestClass]
 public class ProgramTests
@@ -13,4 +13,4 @@ public void MainTest()
         IntelliTect.TestTools.Console.ConsoleAssert.Expect(
             expected, Program.Main);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Chapter18.Tests/Listing18.28.Tests.cs b/src/Chapter18.Tests/Listing18.30.RuntimeBindingToXMLWithDynamics.Tests.cs
similarity index 81%
rename from src/Chapter18.Tests/Listing18.28.Tests.cs
rename to src/Chapter18.Tests/Listing18.30.RuntimeBindingToXMLWithDynamics.Tests.cs
index 344a7b5e1..90b2e1786 100644
--- a/src/Chapter18.Tests/Listing18.28.Tests.cs
+++ b/src/Chapter18.Tests/Listing18.30.RuntimeBindingToXMLWithDynamics.Tests.cs
@@ -1,6 +1,6 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_28.Tests;
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_30.Tests;
 
 [TestClass]
 public class ProgramTests
@@ -13,4 +13,4 @@ public void MainTest()
         IntelliTect.TestTools.Console.ConsoleAssert.Expect(
             expected, Program.Main);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Chapter18/Listing18.25a.GenericException.cs b/src/Chapter18/Listing18.26.GenericException.cs
similarity index 96%
rename from src/Chapter18/Listing18.25a.GenericException.cs
rename to src/Chapter18/Listing18.26.GenericException.cs
index 55679154d..1c81ada78 100644
--- a/src/Chapter18/Listing18.25a.GenericException.cs
+++ b/src/Chapter18/Listing18.26.GenericException.cs
@@ -1,4 +1,4 @@
-namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_25a;
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_26;
 
 #if NET7_0_OR_GREATER
 #region INCLUDE
@@ -38,4 +38,4 @@ public static TException AssertExceptionThrown(Action testMethod)
     // ...
 }
 #endregion INCLUDE
-#endif // NET7_0_OR_GREATER
\ No newline at end of file
+#endif // NET7_0_OR_GREATER
diff --git a/src/Chapter18/Listing18.25b.CallerArgumentExpression.cs b/src/Chapter18/Listing18.27.CallerArgumentExpression.cs
similarity index 97%
rename from src/Chapter18/Listing18.25b.CallerArgumentExpression.cs
rename to src/Chapter18/Listing18.27.CallerArgumentExpression.cs
index 6c18de875..969e0433d 100644
--- a/src/Chapter18/Listing18.25b.CallerArgumentExpression.cs
+++ b/src/Chapter18/Listing18.27.CallerArgumentExpression.cs
@@ -1,6 +1,6 @@
 using System.Runtime.CompilerServices;
 
-namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_25b;
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_27;
 
 #if NET7_0_OR_GREATER
 #region INCLUDE
@@ -56,4 +56,4 @@ public static TException AssertExceptionThrown(
     // ...
 }
 #endregion INCLUDE
-#endif // NET7_0_OR_GREATER
\ No newline at end of file
+#endif // NET7_0_OR_GREATER
diff --git a/src/Chapter18/Listing18.26.DynamicProgrammingUsingReflection.cs b/src/Chapter18/Listing18.28.DynamicProgrammingUsingReflection.cs
similarity index 98%
rename from src/Chapter18/Listing18.26.DynamicProgrammingUsingReflection.cs
rename to src/Chapter18/Listing18.28.DynamicProgrammingUsingReflection.cs
index c7f9c5248..1d54f7076 100644
--- a/src/Chapter18/Listing18.26.DynamicProgrammingUsingReflection.cs
+++ b/src/Chapter18/Listing18.28.DynamicProgrammingUsingReflection.cs
@@ -1,4 +1,4 @@
-namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_26;
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_28;
 
 public class Program
 {
diff --git a/src/Chapter18/Listing18.27.RuntimeBindingToXMLElementsWithoutDynamic.cs b/src/Chapter18/Listing18.29.RuntimeBindingToXMLElementsWithoutDynamic.cs
similarity index 98%
rename from src/Chapter18/Listing18.27.RuntimeBindingToXMLElementsWithoutDynamic.cs
rename to src/Chapter18/Listing18.29.RuntimeBindingToXMLElementsWithoutDynamic.cs
index 7af50d29e..2a87e91e8 100644
--- a/src/Chapter18/Listing18.27.RuntimeBindingToXMLElementsWithoutDynamic.cs
+++ b/src/Chapter18/Listing18.29.RuntimeBindingToXMLElementsWithoutDynamic.cs
@@ -1,4 +1,4 @@
-namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_27;
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_29;
 
 #region INCLUDE
 using System.Xml.Linq;
diff --git a/src/Chapter18/Listing18.28.RuntimeBindingToXMLWithDynamics.cs b/src/Chapter18/Listing18.30.RuntimeBindingToXMLWithDynamics.cs
similarity index 97%
rename from src/Chapter18/Listing18.28.RuntimeBindingToXMLWithDynamics.cs
rename to src/Chapter18/Listing18.30.RuntimeBindingToXMLWithDynamics.cs
index 6ae9cd733..2e5a36d7a 100644
--- a/src/Chapter18/Listing18.28.RuntimeBindingToXMLWithDynamics.cs
+++ b/src/Chapter18/Listing18.30.RuntimeBindingToXMLWithDynamics.cs
@@ -1,4 +1,4 @@
-namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_28;
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_30;
 
 using Listing18_29;
 public class Program
diff --git a/src/Chapter18/Listing18.29.ImplementingACustomDynamicObject.cs b/src/Chapter18/Listing18.31.ImplementingACustomDynamicObject.cs
similarity index 99%
rename from src/Chapter18/Listing18.29.ImplementingACustomDynamicObject.cs
rename to src/Chapter18/Listing18.31.ImplementingACustomDynamicObject.cs
index 61d6ba8ed..c02a24c57 100644
--- a/src/Chapter18/Listing18.29.ImplementingACustomDynamicObject.cs
+++ b/src/Chapter18/Listing18.31.ImplementingACustomDynamicObject.cs
@@ -1,4 +1,4 @@
-namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_29;
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_31;
 
 #region INCLUDE
 using System.Dynamic;
diff --git a/src/Chapter18/Listing18.30.OverridableMembersOnSystem.Dynamic.DynamicObject.cs b/src/Chapter18/Listing18.32.OverridableMembersOnSystem.Dynamic.DynamicObject.cs
similarity index 95%
rename from src/Chapter18/Listing18.30.OverridableMembersOnSystem.Dynamic.DynamicObject.cs
rename to src/Chapter18/Listing18.32.OverridableMembersOnSystem.Dynamic.DynamicObject.cs
index bdf90872d..46b23bb92 100644
--- a/src/Chapter18/Listing18.30.OverridableMembersOnSystem.Dynamic.DynamicObject.cs
+++ b/src/Chapter18/Listing18.32.OverridableMembersOnSystem.Dynamic.DynamicObject.cs
@@ -1,4 +1,4 @@
-namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_30
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter18.Listing18_32
 {
     #region INCLUDE
     using System.Collections.Generic;