diff --git a/BinaryObjectScanner/FileType/AACSMediaKeyBlock.cs b/BinaryObjectScanner/FileType/AACSMediaKeyBlock.cs
index 50874425..a4afdb3a 100644
--- a/BinaryObjectScanner/FileType/AACSMediaKeyBlock.cs
+++ b/BinaryObjectScanner/FileType/AACSMediaKeyBlock.cs
@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using SabreTools.Models.AACS;
 
 namespace BinaryObjectScanner.FileType
 {
@@ -14,8 +15,8 @@ namespace BinaryObjectScanner.FileType
         /// <inheritdoc/>
         public override string? Detect(Stream stream, string file, bool includeDebug)
         {
-            var record = Array.Find(_wrapper.Records, r => r.RecordType == SabreTools.Models.AACS.RecordType.TypeAndVersion);
-            if (record is SabreTools.Models.AACS.TypeAndVersionRecord tavr)
+            var record = Array.Find(_wrapper.Records, r => r.RecordType == RecordType.TypeAndVersion);
+            if (record is TypeAndVersionRecord tavr)
                 return $"AACS {tavr.VersionNumber}";
 
             return "AACS (Unknown Version)";
diff --git a/BinaryObjectScanner/FileType/PLJ.cs b/BinaryObjectScanner/FileType/PLJ.cs
index eda378ed..974806d3 100644
--- a/BinaryObjectScanner/FileType/PLJ.cs
+++ b/BinaryObjectScanner/FileType/PLJ.cs
@@ -1,14 +1,15 @@
 using System.IO;
+using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.FileType
 {
     /// <summary>
     /// PlayJ audio file
     /// </summary>
-    public class PLJ : DetectableBase<SabreTools.Serialization.Wrappers.PlayJAudioFile>
+    public class PLJ : DetectableBase<PlayJAudioFile>
     {
         /// <inheritdoc/>
-        public PLJ(SabreTools.Serialization.Wrappers.PlayJAudioFile? wrapper) : base(wrapper) { }
+        public PLJ(PlayJAudioFile? wrapper) : base(wrapper) { }
 
         /// <inheritdoc/>
         public override string? Detect(Stream stream, string file, bool includeDebug)