diff --git a/Aaru.Core/Devices/Dumping/ATA.cs b/Aaru.Core/Devices/Dumping/ATA.cs
index fdb41b4d1..4e93229ad 100644
--- a/Aaru.Core/Devices/Dumping/ATA.cs
+++ b/Aaru.Core/Devices/Dumping/ATA.cs
@@ -581,7 +581,7 @@ namespace Aaru.Core.Devices.Dumping
                     // TODO: Non-removable
                     var metadata = new CommonTypes.Structs.ImageInfo
                     {
-                        Application = "DiscImageChef", ApplicationVersion = Version.GetVersion()
+                        Application = "Aaru", ApplicationVersion = Version.GetVersion()
                     };
 
                     if(!_outputPlugin.SetMetadata(metadata))
diff --git a/Aaru.Core/Devices/Dumping/CompactDisc/Dump.cs b/Aaru.Core/Devices/Dumping/CompactDisc/Dump.cs
index 50adf01df..6c81953d6 100644
--- a/Aaru.Core/Devices/Dumping/CompactDisc/Dump.cs
+++ b/Aaru.Core/Devices/Dumping/CompactDisc/Dump.cs
@@ -1044,7 +1044,7 @@ namespace Aaru.Core.Devices.Dumping
             // TODO: Disc ID
             var metadata = new CommonTypes.Structs.ImageInfo
             {
-                Application = "DiscImageChef", ApplicationVersion = Version.GetVersion()
+                Application = "Aaru", ApplicationVersion = Version.GetVersion()
             };
 
             if(!_outputPlugin.SetMetadata(metadata))
diff --git a/Aaru.Core/Devices/Dumping/PlayStationPortable.cs b/Aaru.Core/Devices/Dumping/PlayStationPortable.cs
index a316dad36..4e09441c3 100644
--- a/Aaru.Core/Devices/Dumping/PlayStationPortable.cs
+++ b/Aaru.Core/Devices/Dumping/PlayStationPortable.cs
@@ -622,7 +622,7 @@ namespace Aaru.Core.Devices.Dumping
 
             var metadata = new CommonTypes.Structs.ImageInfo
             {
-                Application     = "DiscImageChef", ApplicationVersion = Version.GetVersion(),
+                Application     = "Aaru", ApplicationVersion = Version.GetVersion(),
                 MediaPartNumber = mediaPartNumber
             };
 
@@ -1095,7 +1095,7 @@ namespace Aaru.Core.Devices.Dumping
 
             var metadata = new CommonTypes.Structs.ImageInfo
             {
-                Application = "DiscImageChef", ApplicationVersion = Version.GetVersion()
+                Application = "Aaru", ApplicationVersion = Version.GetVersion()
             };
 
             if(!_outputPlugin.SetMetadata(metadata))
diff --git a/Aaru.Core/Devices/Dumping/ResumeSupport.cs b/Aaru.Core/Devices/Dumping/ResumeSupport.cs
index 64c364293..a8bbc327a 100644
--- a/Aaru.Core/Devices/Dumping/ResumeSupport.cs
+++ b/Aaru.Core/Devices/Dumping/ResumeSupport.cs
@@ -108,7 +108,7 @@ namespace Aaru.Core.Devices.Dumping
                     if(oldTry.Software == null)
                         throw new InvalidOperationException("Found corrupt resume file, cannot continue...");
 
-                    if(oldTry.Software.Name            != "DiscImageChef"     ||
+                    if(oldTry.Software.Name            != "Aaru"     ||
                        oldTry.Software.OperatingSystem != platform.ToString() ||
                        oldTry.Software.Version         != Version.GetVersion())
                         continue;
diff --git a/Aaru.Core/Devices/Dumping/SBC.cs b/Aaru.Core/Devices/Dumping/SBC.cs
index ad0af014e..1f9702e66 100644
--- a/Aaru.Core/Devices/Dumping/SBC.cs
+++ b/Aaru.Core/Devices/Dumping/SBC.cs
@@ -984,7 +984,7 @@ namespace Aaru.Core.Devices.Dumping
             // TODO: Non-removable drive information
             var metadata = new CommonTypes.Structs.ImageInfo
             {
-                Application = "DiscImageChef", ApplicationVersion = Version.GetVersion()
+                Application = "Aaru", ApplicationVersion = Version.GetVersion()
             };
 
             if(!_outputPlugin.SetMetadata(metadata))
diff --git a/Aaru.Core/Devices/Dumping/SSC.cs b/Aaru.Core/Devices/Dumping/SSC.cs
index 7d9678a07..ff39b5cc3 100644
--- a/Aaru.Core/Devices/Dumping/SSC.cs
+++ b/Aaru.Core/Devices/Dumping/SSC.cs
@@ -1226,7 +1226,7 @@ namespace Aaru.Core.Devices.Dumping
             // TODO: Media Serial Number
             var metadata = new CommonTypes.Structs.ImageInfo
             {
-                Application = "DiscImageChef", ApplicationVersion = Version.GetVersion()
+                Application = "Aaru", ApplicationVersion = Version.GetVersion()
             };
 
             if(!_outputPlugin.SetMetadata(metadata))
diff --git a/Aaru.Core/Devices/Dumping/SecureDigital.cs b/Aaru.Core/Devices/Dumping/SecureDigital.cs
index 289c30abc..089bd7673 100644
--- a/Aaru.Core/Devices/Dumping/SecureDigital.cs
+++ b/Aaru.Core/Devices/Dumping/SecureDigital.cs
@@ -527,7 +527,7 @@ namespace Aaru.Core.Devices.Dumping
             // TODO: Drive info
             var metadata = new CommonTypes.Structs.ImageInfo
             {
-                Application = "DiscImageChef", ApplicationVersion = Version.GetVersion()
+                Application = "Aaru", ApplicationVersion = Version.GetVersion()
             };
 
             if(!_outputPlugin.SetMetadata(metadata))
diff --git a/Aaru.Core/Devices/Dumping/XGD.cs b/Aaru.Core/Devices/Dumping/XGD.cs
index 6a9bfc683..9c3e7a77b 100644
--- a/Aaru.Core/Devices/Dumping/XGD.cs
+++ b/Aaru.Core/Devices/Dumping/XGD.cs
@@ -1150,7 +1150,7 @@ namespace Aaru.Core.Devices.Dumping
 
             var metadata = new CommonTypes.Structs.ImageInfo
             {
-                Application = "DiscImageChef", ApplicationVersion = Version.GetVersion()
+                Application = "Aaru", ApplicationVersion = Version.GetVersion()
             };
 
             if(!_outputPlugin.SetMetadata(metadata))
diff --git a/Aaru.Core/Devices/ReaderSCSI.cs b/Aaru.Core/Devices/ReaderSCSI.cs
index 9a7b58eee..f50291ae7 100644
--- a/Aaru.Core/Devices/ReaderSCSI.cs
+++ b/Aaru.Core/Devices/ReaderSCSI.cs
@@ -117,7 +117,7 @@ namespace Aaru.Core.Devices
                         decSense = Decoders.SCSI.Sense.DecodeFixed(senseBuf);
                         if (decSense.HasValue)
                         {
-                            if (decSense.Value.SenseKey == DiscImageChef.Decoders.SCSI.SenseKeys.IllegalRequest &&
+                            if (decSense.Value.SenseKey == Aaru.Decoders.SCSI.SenseKeys.IllegalRequest &&
                                 decSense.Value.ASC == 0x24 && decSense.Value.ASCQ == 0x00)
                             {
                                 readRaw = true;
diff --git a/Aaru.Core/Logging/DumpLog.cs b/Aaru.Core/Logging/DumpLog.cs
index bf2a2ed3d..76c594789 100644
--- a/Aaru.Core/Logging/DumpLog.cs
+++ b/Aaru.Core/Logging/DumpLog.cs
@@ -80,7 +80,7 @@ namespace Aaru.Core.Logging
             logSw.WriteLine();
 
             logSw.WriteLine("################# Program information ################");
-            logSw.WriteLine("DiscImageChef {0}", assemblyVersion?.InformationalVersion);
+            logSw.WriteLine("Aaru {0}", assemblyVersion?.InformationalVersion);
             logSw.WriteLine("Running in {0}-bit", Environment.Is64BitProcess ? 64 : 32);
         #if DEBUG
             logSw.WriteLine("DEBUG version");