diff --git a/SabreTools.Skippers/Enums.cs b/SabreTools.Skippers/Enums.cs
index ab4ae5d6..1d102c18 100644
--- a/SabreTools.Skippers/Enums.cs
+++ b/SabreTools.Skippers/Enums.cs
@@ -1,4 +1,6 @@
-namespace SabreTools.Skippers
+using System.Xml.Serialization;
+
+namespace SabreTools.Skippers
 {
     /// <summary>
     /// Determines the header skip operation
@@ -6,9 +8,17 @@
     public enum HeaderSkipOperation
     {
         None = 0,
+
+        [XmlEnum("bitswap")]
         Bitswap,
+
+        [XmlEnum("byteswap")]
         Byteswap,
+
+        [XmlEnum("wordswap")]
         Wordswap,
+
+        [XmlEnum("wordbyteswap")]
         WordByteswap,
     }
 
@@ -17,8 +27,13 @@
     /// </summary>
     public enum HeaderSkipTestFileOperator
     {
+        [XmlEnum("equal")]
         Equal = 0,
+
+        [XmlEnum("less")]
         Less,
+
+        [XmlEnum("greater")]
         Greater,
     }
 }
diff --git a/SabreTools.Skippers/SkipperTest.cs b/SabreTools.Skippers/SkipperTest.cs
index 25fa472e..dec415ba 100644
--- a/SabreTools.Skippers/SkipperTest.cs
+++ b/SabreTools.Skippers/SkipperTest.cs
@@ -95,7 +95,7 @@ namespace SabreTools.Skippers
     /// <summary>
     /// Skipper test using AND
     /// </summary>
-    [XmlRoot("and")]
+    [XmlType("and")]
     public class AndSkipperTest : SkipperTest
     {
         /// <inheritdoc/>
@@ -140,7 +140,7 @@ namespace SabreTools.Skippers
     /// <summary>
     /// Skipper test using DATA
     /// </summary>
-    [XmlRoot("data")]
+    [XmlType("data")]
     public class DataSkipperTest : SkipperTest
     {
         /// <inheritdoc/>
@@ -177,7 +177,7 @@ namespace SabreTools.Skippers
     /// <summary>
     /// Skipper test using FILE
     /// </summary>
-    [XmlRoot("file")]
+    [XmlType("file")]
     public class FileSkipperTest : SkipperTest
     {
         /// <inheritdoc/>
@@ -214,7 +214,7 @@ namespace SabreTools.Skippers
     /// <summary>
     /// Skipper test using OR
     /// </summary>
-    [XmlRoot("or")]
+    [XmlType("or")]
     public class OrSkipperTest : SkipperTest
     {
         /// <inheritdoc/>
@@ -259,7 +259,7 @@ namespace SabreTools.Skippers
     /// <summary>
     /// Skipper test using XOR
     /// </summary>
-    [XmlRoot("xor")]
+    [XmlType("xor")]
     public class XorSkipperTest : SkipperTest
     {
         /// <inheritdoc/>