diff --git a/Aaru.CommonTypes b/Aaru.CommonTypes
index ee657ecfa..6d8fcb4d8 160000
--- a/Aaru.CommonTypes
+++ b/Aaru.CommonTypes
@@ -1 +1 @@
-Subproject commit ee657ecfa59c2479f924a5ddad3ec2bc09b6f3a7
+Subproject commit 6d8fcb4d8bce23a9f767b164fb20ddf12c87137a
diff --git a/Aaru.Decoders b/Aaru.Decoders
index c1f24c46a..e72768392 160000
--- a/Aaru.Decoders
+++ b/Aaru.Decoders
@@ -1 +1 @@
-Subproject commit c1f24c46a97a6c1ac389053a8362b42631c6bef4
+Subproject commit e72768392972d93a0f31a4ae740fce0c34a96a69
diff --git a/Aaru.Devices/Device/MmcCommands/MMC.cs b/Aaru.Devices/Device/MmcCommands/MMC.cs
index dafad9b70..e07705613 100644
--- a/Aaru.Devices/Device/MmcCommands/MMC.cs
+++ b/Aaru.Devices/Device/MmcCommands/MMC.cs
@@ -163,11 +163,11 @@ public partial class Device
         if(transferLength <= 1)
             return ReadSingleBlock(out buffer, out response, lba, blockSize, byteAddressed, timeout, out duration);
 
-        if(!_readMultipleBlockCannotSetBlockCount)
+        if(!ReadMultipleBlockCannotSetBlockCount)
             sense = ReadMultipleBlock(out buffer, out response, lba, blockSize, transferLength, byteAddressed, timeout,
                                       out duration);
 
-        if(_readMultipleBlockCannotSetBlockCount)
+        if(ReadMultipleBlockCannotSetBlockCount)
             return ReadMultipleUsingSingle(out buffer, out response, lba, blockSize, transferLength, byteAddressed,
                                            timeout, out duration);
 
@@ -206,7 +206,7 @@ public partial class Device
         return sense;
     }
 
-    protected static bool _readMultipleBlockCannotSetBlockCount;
+    protected static bool ReadMultipleBlockCannotSetBlockCount;
 
     /// <summary>Reads multiple blocks from a SecureDigital or MultiMediaCard device</summary>
     /// <param name="buffer">Data buffer</param>
diff --git a/Aaru.Devices/Linux/Device.cs b/Aaru.Devices/Linux/Device.cs
index ec096cc78..97341a4d2 100644
--- a/Aaru.Devices/Linux/Device.cs
+++ b/Aaru.Devices/Linux/Device.cs
@@ -96,7 +96,7 @@ partial class Device : Devices.Device
 
         // Seems ioctl(2) does not allow the atomicity needed
         if(dev.PlatformId == PlatformID.Linux)
-            _readMultipleBlockCannotSetBlockCount = true;
+            ReadMultipleBlockCannotSetBlockCount = true;
 
         dev.Type     = DeviceType.Unknown;
         dev.ScsiType = PeripheralDeviceTypes.UnknownDevice;
diff --git a/Aaru.Devices/Remote/Device.cs b/Aaru.Devices/Remote/Device.cs
index 74209d23d..4820e71d8 100644
--- a/Aaru.Devices/Remote/Device.cs
+++ b/Aaru.Devices/Remote/Device.cs
@@ -127,7 +127,7 @@ public sealed partial class Device : Devices.Device
         }
 
         if(dev._remote.ServerOperatingSystem == "Linux")
-            _readMultipleBlockCannotSetBlockCount = true;
+            ReadMultipleBlockCannotSetBlockCount = true;
 
         dev.Type     = DeviceType.Unknown;
         dev.ScsiType = PeripheralDeviceTypes.UnknownDevice;
diff --git a/Aaru.Filesystems/ISO9660/Structs/Internal.cs b/Aaru.Filesystems/ISO9660/Structs/Internal.cs
index 0a1b910bb..4b0eed42f 100644
--- a/Aaru.Filesystems/ISO9660/Structs/Internal.cs
+++ b/Aaru.Filesystems/ISO9660/Structs/Internal.cs
@@ -89,6 +89,8 @@ public sealed partial class ISO9660
         public string                         SymbolicLink;
         public DateTime?                      Timestamp;
         public ushort                         VolumeSequenceNumber;
+
+        // ReSharper disable once InconsistentNaming
         public CdromXa?                       XA;
         public byte                           XattrLength;
 
diff --git a/Aaru.Images/ByteAddressable/SegaMegaDrive.cs b/Aaru.Images/ByteAddressable/SegaMegaDrive.cs
index b0a29583a..f43de6715 100644
--- a/Aaru.Images/ByteAddressable/SegaMegaDrive.cs
+++ b/Aaru.Images/ByteAddressable/SegaMegaDrive.cs
@@ -526,11 +526,11 @@ public class SegaMegaDrive : IByteAddressableImage
         SegaHeader header =
             Marshal.ByteArrayToStructureBigEndian<SegaHeader>(_data, 0x100, Marshal.SizeOf<SegaHeader>());
 
-        bool extraRAM = header.ExtraRamPresent[0] == 0x52 && header.ExtraRamPresent[1] == 0x41;
+        bool extraRam = header.ExtraRamPresent[0] == 0x52 && header.ExtraRamPresent[1] == 0x41;
 
         mappings = new LinearMemoryMap
         {
-            Devices = extraRAM ? new LinearMemoryDevice[2] : new LinearMemoryDevice[1]
+            Devices = extraRam ? new LinearMemoryDevice[2] : new LinearMemoryDevice[1]
         };
 
         mappings.Devices[0].Type = LinearMemoryType.ROM;
@@ -547,7 +547,7 @@ public class SegaMegaDrive : IByteAddressableImage
             Length = header.RomEnd - header.RomStart + 1
         };
 
-        if(!extraRAM)
+        if(!extraRam)
             return ErrorNumber.NoError;
 
         mappings.Devices[1].PhysicalAddress = new LinearMemoryAddressing
diff --git a/Aaru.Images/SuperCardPro/Enums.cs b/Aaru.Images/SuperCardPro/Enums.cs
index dbb4b4d17..5abd61e5b 100644
--- a/Aaru.Images/SuperCardPro/Enums.cs
+++ b/Aaru.Images/SuperCardPro/Enums.cs
@@ -33,9 +33,11 @@
 namespace Aaru.DiscImages;
 
 using System;
+using System.Diagnostics.CodeAnalysis;
 
 public sealed partial class SuperCardPro
 {
+    [SuppressMessage("ReSharper", "InconsistentNaming")]
     public enum ScpDiskType : byte
     {
         Commodore64    = 0x00,