diff --git a/SabreTools.Serialization/SabreTools.Data.Extensions/Atari7800Cart.cs b/SabreTools.Serialization/SabreTools.Data.Extensions/Atari7800CartExtensions.cs
similarity index 99%
rename from SabreTools.Serialization/SabreTools.Data.Extensions/Atari7800Cart.cs
rename to SabreTools.Serialization/SabreTools.Data.Extensions/Atari7800CartExtensions.cs
index 4f1c1283..6663010c 100644
--- a/SabreTools.Serialization/SabreTools.Data.Extensions/Atari7800Cart.cs
+++ b/SabreTools.Serialization/SabreTools.Data.Extensions/Atari7800CartExtensions.cs
@@ -3,7 +3,7 @@ using SabreTools.Data.Models.Atari7800;
 
 namespace SabreTools.Data.Extensions
 {
-    public static class Atari7800Cart
+    public static class Atari7800CartExtensions
     {
         /// <summary>
         /// Convert a <see cref="AudioDevice"/> value to string
diff --git a/SabreTools.Serialization/SabreTools.Data.Extensions/AtariLynxCart.cs b/SabreTools.Serialization/SabreTools.Data.Extensions/AtariLynxCartExtensions.cs
similarity index 93%
rename from SabreTools.Serialization/SabreTools.Data.Extensions/AtariLynxCart.cs
rename to SabreTools.Serialization/SabreTools.Data.Extensions/AtariLynxCartExtensions.cs
index 56250d26..c4cf3709 100644
--- a/SabreTools.Serialization/SabreTools.Data.Extensions/AtariLynxCart.cs
+++ b/SabreTools.Serialization/SabreTools.Data.Extensions/AtariLynxCartExtensions.cs
@@ -2,7 +2,7 @@ using SabreTools.Data.Models.AtariLynx;
 
 namespace SabreTools.Data.Extensions
 {
-    public static class AtariLynxCart
+    public static class AtariLynxCartExtensions
     {
         /// <summary>
         /// Convert a <see cref="Rotation"/> value to string
diff --git a/SabreTools.Serialization/SabreTools.Data.Extensions/CDROM.cs b/SabreTools.Serialization/SabreTools.Data.Extensions/CDROMExtensions.cs
similarity index 99%
rename from SabreTools.Serialization/SabreTools.Data.Extensions/CDROM.cs
rename to SabreTools.Serialization/SabreTools.Data.Extensions/CDROMExtensions.cs
index 44929d54..184e5acb 100644
--- a/SabreTools.Serialization/SabreTools.Data.Extensions/CDROM.cs
+++ b/SabreTools.Serialization/SabreTools.Data.Extensions/CDROMExtensions.cs
@@ -5,7 +5,7 @@ using SabreTools.IO.Extensions;
 
 namespace SabreTools.Data.Extensions
 {
-    public static class CDROM
+    public static class CDROMExtensions
     {
         /// <summary>
         /// Get the sector mode for a CD-ROM stream
diff --git a/SabreTools.Serialization/SabreTools.Data.Extensions/CFB.cs b/SabreTools.Serialization/SabreTools.Data.Extensions/CFBExtensions.cs
similarity index 98%
rename from SabreTools.Serialization/SabreTools.Data.Extensions/CFB.cs
rename to SabreTools.Serialization/SabreTools.Data.Extensions/CFBExtensions.cs
index 5b39f3ef..f1010101 100644
--- a/SabreTools.Serialization/SabreTools.Data.Extensions/CFB.cs
+++ b/SabreTools.Serialization/SabreTools.Data.Extensions/CFBExtensions.cs
@@ -2,7 +2,7 @@ using System.Text;
 
 namespace SabreTools.Data.Extensions
 {
-    public static class CFB
+    public static class CFBExtensions
     {
         /// <summary>
         /// Decode a MIME-encoded stream name stored as a byte array
diff --git a/SabreTools.Serialization/SabreTools.Data.Extensions/ISO9660.cs b/SabreTools.Serialization/SabreTools.Data.Extensions/ISO9660Extensions.cs
similarity index 97%
rename from SabreTools.Serialization/SabreTools.Data.Extensions/ISO9660.cs
rename to SabreTools.Serialization/SabreTools.Data.Extensions/ISO9660Extensions.cs
index 19630930..9bc94a75 100644
--- a/SabreTools.Serialization/SabreTools.Data.Extensions/ISO9660.cs
+++ b/SabreTools.Serialization/SabreTools.Data.Extensions/ISO9660Extensions.cs
@@ -3,7 +3,7 @@ using SabreTools.Numerics;
 
 namespace SabreTools.Data.Extensions
 {
-    public static class ISO9660
+    public static class ISO9660Extensions
     {
         /// <summary>
         /// Get the logical block size from a sector length
diff --git a/SabreTools.Serialization/SabreTools.Data.Extensions/InstallShieldCabinet.cs b/SabreTools.Serialization/SabreTools.Data.Extensions/InstallShieldCabinetExtensions.cs
similarity index 98%
rename from SabreTools.Serialization/SabreTools.Data.Extensions/InstallShieldCabinet.cs
rename to SabreTools.Serialization/SabreTools.Data.Extensions/InstallShieldCabinetExtensions.cs
index 89c9dcc9..b1ad9589 100644
--- a/SabreTools.Serialization/SabreTools.Data.Extensions/InstallShieldCabinet.cs
+++ b/SabreTools.Serialization/SabreTools.Data.Extensions/InstallShieldCabinetExtensions.cs
@@ -2,7 +2,7 @@ using SabreTools.Data.Models.InstallShieldCabinet;
 
 namespace SabreTools.Data.Extensions
 {
-    public static class InstallShieldCabinet
+    public static class InstallShieldCabinetExtensions
     {
         #region File Descriptors
 
diff --git a/SabreTools.Serialization/SabreTools.Data.Extensions/NESCart.cs b/SabreTools.Serialization/SabreTools.Data.Extensions/NESCartExtensions.cs
similarity index 99%
rename from SabreTools.Serialization/SabreTools.Data.Extensions/NESCart.cs
rename to SabreTools.Serialization/SabreTools.Data.Extensions/NESCartExtensions.cs
index 1345cc4a..13ef8b59 100644
--- a/SabreTools.Serialization/SabreTools.Data.Extensions/NESCart.cs
+++ b/SabreTools.Serialization/SabreTools.Data.Extensions/NESCartExtensions.cs
@@ -2,7 +2,7 @@ using SabreTools.Data.Models.NES;
 
 namespace SabreTools.Data.Extensions
 {
-    public static class NESCart
+    public static class NESCartExtensions
     {
         /// <summary>
         /// Convert a <see cref="ConsoleType"/> value to string
diff --git a/SabreTools.Serialization/SabreTools.Data.Extensions/NewExecutable.cs b/SabreTools.Serialization/SabreTools.Data.Extensions/NewExecutableExtensions.cs
similarity index 97%
rename from SabreTools.Serialization/SabreTools.Data.Extensions/NewExecutable.cs
rename to SabreTools.Serialization/SabreTools.Data.Extensions/NewExecutableExtensions.cs
index d140e2c8..ac35346b 100644
--- a/SabreTools.Serialization/SabreTools.Data.Extensions/NewExecutable.cs
+++ b/SabreTools.Serialization/SabreTools.Data.Extensions/NewExecutableExtensions.cs
@@ -2,7 +2,7 @@ using SabreTools.Data.Models.NewExecutable;
 
 namespace SabreTools.Data.Extensions
 {
-    public static class NewExecutable
+    public static class NewExecutableExtensions
     {
         /// <summary>
         /// Determine if a resource type information entry is an integer or offset
diff --git a/SabreTools.Serialization/SabreTools.Data.Extensions/PortableExecutable.cs b/SabreTools.Serialization/SabreTools.Data.Extensions/PortableExecutableExtensions.cs
similarity index 98%
rename from SabreTools.Serialization/SabreTools.Data.Extensions/PortableExecutable.cs
rename to SabreTools.Serialization/SabreTools.Data.Extensions/PortableExecutableExtensions.cs
index 2d570fbc..622e9959 100644
--- a/SabreTools.Serialization/SabreTools.Data.Extensions/PortableExecutable.cs
+++ b/SabreTools.Serialization/SabreTools.Data.Extensions/PortableExecutableExtensions.cs
@@ -3,7 +3,7 @@ using SabreTools.Data.Models.COFF;
 
 namespace SabreTools.Data.Extensions
 {
-    public static class PortableExecutable
+    public static class PortableExecutableExtensions
     {
         /// <summary>
         /// Convert a relative virtual address to a physical one
diff --git a/SabreTools.Serialization/SabreTools.Data.Extensions/TypeLengthValue.cs b/SabreTools.Serialization/SabreTools.Data.Extensions/TypeLengthValueExtensions.cs
similarity index 97%
rename from SabreTools.Serialization/SabreTools.Data.Extensions/TypeLengthValue.cs
rename to SabreTools.Serialization/SabreTools.Data.Extensions/TypeLengthValueExtensions.cs
index f0ce4263..d0af29be 100644
--- a/SabreTools.Serialization/SabreTools.Data.Extensions/TypeLengthValue.cs
+++ b/SabreTools.Serialization/SabreTools.Data.Extensions/TypeLengthValueExtensions.cs
@@ -6,14 +6,14 @@ using SabreTools.ObjectIdentifier;
 
 namespace SabreTools.Data.Extensions
 {
-    public static class TypeLengthValue
+    public static class TypeLengthValueExtensions
     {
         /// <summary>
         /// Format a TypeLengthValue as a string
         /// </summary>
         /// <param name="paddingLevel">Padding level of the item when formatting</param>
         /// <returns>String representing the TypeLengthValue, if possible</returns>
-        public static string Format(this Models.ASN1.TypeLengthValue tlv, int paddingLevel = 0)
+        public static string Format(this TypeLengthValue tlv, int paddingLevel = 0)
         {
             // Create the left-padding string
             string padding = new(' ', paddingLevel);
@@ -38,7 +38,7 @@ namespace SabreTools.Data.Extensions
             if (tlv.Type.HasFlag(ASN1Type.V_ASN1_CONSTRUCTED))
 #endif
             {
-                if (tlv.Value is not Models.ASN1.TypeLengthValue[] valueAsObjectArray)
+                if (tlv.Value is not TypeLengthValue[] valueAsObjectArray)
                 {
                     formatBuilder.Append(", Value: [INVALID DATA TYPE]");
                     return formatBuilder.ToString();
diff --git a/SabreTools.Serialization/SabreTools.Data.Extensions/WiseScript.cs b/SabreTools.Serialization/SabreTools.Data.Extensions/WiseScriptExtensions.cs
similarity index 98%
rename from SabreTools.Serialization/SabreTools.Data.Extensions/WiseScript.cs
rename to SabreTools.Serialization/SabreTools.Data.Extensions/WiseScriptExtensions.cs
index 997d8d99..bd315058 100644
--- a/SabreTools.Serialization/SabreTools.Data.Extensions/WiseScript.cs
+++ b/SabreTools.Serialization/SabreTools.Data.Extensions/WiseScriptExtensions.cs
@@ -3,7 +3,7 @@ using System.Text.RegularExpressions;
 #pragma warning disable SYSLIB1045 // Convert to 'GeneratedRegexAttribute'
 namespace SabreTools.Data.Extensions
 {
-    public static class WiseScript
+    public static class WiseScriptExtensions
     {
         /// <summary>
         /// Convert a Wise function ID to the formal action name
diff --git a/SabreTools.Serialization/SabreTools.Data.Extensions/XZ.cs b/SabreTools.Serialization/SabreTools.Data.Extensions/XZExtensions.cs
similarity index 98%
rename from SabreTools.Serialization/SabreTools.Data.Extensions/XZ.cs
rename to SabreTools.Serialization/SabreTools.Data.Extensions/XZExtensions.cs
index 2330ce86..9b6eb5bf 100644
--- a/SabreTools.Serialization/SabreTools.Data.Extensions/XZ.cs
+++ b/SabreTools.Serialization/SabreTools.Data.Extensions/XZExtensions.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 
 namespace SabreTools.Data.Extensions
 {
-    public static class XZ
+    public static class XZExtensions
     {
         /// <summary>
         /// Decode a value from a variable-length integer
diff --git a/SabreTools.Serialization/SabreTools.Data.Extensions/XboxExecutable.cs b/SabreTools.Serialization/SabreTools.Data.Extensions/XboxExecutableExtensions.cs
similarity index 95%
rename from SabreTools.Serialization/SabreTools.Data.Extensions/XboxExecutable.cs
rename to SabreTools.Serialization/SabreTools.Data.Extensions/XboxExecutableExtensions.cs
index 3f89d23e..f9d5ca4e 100644
--- a/SabreTools.Serialization/SabreTools.Data.Extensions/XboxExecutable.cs
+++ b/SabreTools.Serialization/SabreTools.Data.Extensions/XboxExecutableExtensions.cs
@@ -3,7 +3,7 @@ using SabreTools.IO.Extensions;
 
 namespace SabreTools.Data.Extensions
 {
-    public static class XboxExecutable
+    public static class XboxExecutableExtensions
     {
         /// <summary>
         /// Convert a UInt32 to a formatted XBE title ID