diff --git a/Aaru.Checksums.csproj b/Aaru.Checksums.csproj
index b537ff3ed..7f0939798 100644
--- a/Aaru.Checksums.csproj
+++ b/Aaru.Checksums.csproj
@@ -6,7 +6,7 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{CC48B324-A532-4A45-87A6-6F91F7141E8D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <RootNamespace>DiscImageChef.Checksums</RootNamespace>
+    <RootNamespace>Aaru.Checksums</RootNamespace>
     <AssemblyName>Aaru.Checksums</AssemblyName>
     <ReleaseVersion>$(Version)</ReleaseVersion>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
diff --git a/Adler32Context.cs b/Adler32Context.cs
index 6ab855f81..1bee94850 100644
--- a/Adler32Context.cs
+++ b/Adler32Context.cs
@@ -32,9 +32,9 @@
 
 using System.IO;
 using System.Text;
-using DiscImageChef.CommonTypes.Interfaces;
+using Aaru.CommonTypes.Interfaces;
 
-namespace DiscImageChef.Checksums
+namespace Aaru.Checksums
 {
     /// <summary>
     ///     Implements the Adler-32 algorithm
diff --git a/CDChecksums.cs b/CDChecksums.cs
index fb776502c..cd81a20ce 100644
--- a/CDChecksums.cs
+++ b/CDChecksums.cs
@@ -33,9 +33,9 @@
 
 using System;
 using System.Collections.Generic;
-using DiscImageChef.Console;
+using Aaru.Console;
 
-namespace DiscImageChef.Checksums
+namespace Aaru.Checksums
 {
     /// <summary>Implements ReedSolomon and CRC32 algorithms as used by CD-ROM</summary>
     public static class CdChecksums
diff --git a/CRC16CCITTContext.cs b/CRC16CCITTContext.cs
index 808530538..36b151ca0 100644
--- a/CRC16CCITTContext.cs
+++ b/CRC16CCITTContext.cs
@@ -1,4 +1,4 @@
-namespace DiscImageChef.Checksums
+namespace Aaru.Checksums
 {
     public class CRC16CCITTContext : Crc16Context
     {
diff --git a/CRC16Context.cs b/CRC16Context.cs
index c9ff1df9a..e2e5e5a9c 100644
--- a/CRC16Context.cs
+++ b/CRC16Context.cs
@@ -33,9 +33,9 @@
 using System.IO;
 using System.Linq;
 using System.Text;
-using DiscImageChef.CommonTypes.Interfaces;
+using Aaru.CommonTypes.Interfaces;
 
-namespace DiscImageChef.Checksums
+namespace Aaru.Checksums
 {
     /// <summary>Implements a CRC16 algorithm</summary>
     public class Crc16Context : IChecksum
diff --git a/CRC16IBMContext.cs b/CRC16IBMContext.cs
index 9626b1fe4..63b3a812f 100644
--- a/CRC16IBMContext.cs
+++ b/CRC16IBMContext.cs
@@ -1,4 +1,4 @@
-namespace DiscImageChef.Checksums
+namespace Aaru.Checksums
 {
     public class CRC16IBMContext : Crc16Context
     {
diff --git a/CRC32Context.cs b/CRC32Context.cs
index 029b76f3d..30af7930d 100644
--- a/CRC32Context.cs
+++ b/CRC32Context.cs
@@ -32,9 +32,9 @@
 
 using System.IO;
 using System.Text;
-using DiscImageChef.CommonTypes.Interfaces;
+using Aaru.CommonTypes.Interfaces;
 
-namespace DiscImageChef.Checksums
+namespace Aaru.Checksums
 {
     /// <summary>
     ///     Implements a CRC32 algorithm
diff --git a/CRC64Context.cs b/CRC64Context.cs
index ada7cd9f6..3178561f0 100644
--- a/CRC64Context.cs
+++ b/CRC64Context.cs
@@ -32,9 +32,9 @@
 
 using System.IO;
 using System.Text;
-using DiscImageChef.CommonTypes.Interfaces;
+using Aaru.CommonTypes.Interfaces;
 
-namespace DiscImageChef.Checksums
+namespace Aaru.Checksums
 {
     /// <summary>
     ///     Implements a CRC64 algorithm
diff --git a/FletcherContext.cs b/FletcherContext.cs
index d3fbba07a..37d8f43c5 100644
--- a/FletcherContext.cs
+++ b/FletcherContext.cs
@@ -34,9 +34,9 @@
 
 using System.IO;
 using System.Text;
-using DiscImageChef.CommonTypes.Interfaces;
+using Aaru.CommonTypes.Interfaces;
 
-namespace DiscImageChef.Checksums
+namespace Aaru.Checksums
 {
     /// <summary>
     ///     Implements the Fletcher-32 algorithm
diff --git a/MD5Context.cs b/MD5Context.cs
index 883d93d39..dbdc36a6f 100644
--- a/MD5Context.cs
+++ b/MD5Context.cs
@@ -33,9 +33,9 @@
 using System.IO;
 using System.Security.Cryptography;
 using System.Text;
-using DiscImageChef.CommonTypes.Interfaces;
+using Aaru.CommonTypes.Interfaces;
 
-namespace DiscImageChef.Checksums
+namespace Aaru.Checksums
 {
     /// <summary>
     ///     Wraps up .NET MD5 implementation to a Init(), Update(), Final() context.
diff --git a/ReedSolomon.cs b/ReedSolomon.cs
index be2e5f60e..219ca22b7 100644
--- a/ReedSolomon.cs
+++ b/ReedSolomon.cs
@@ -58,9 +58,9 @@
  */
 
 using System;
-using DiscImageChef.Console;
+using Aaru.Console;
 
-namespace DiscImageChef.Checksums
+namespace Aaru.Checksums
 {
     /// <summary>
     ///     Implements the Reed-Solomon algorithm
diff --git a/Register.cs b/Register.cs
index 7dcaa28d8..845b9a3ec 100644
--- a/Register.cs
+++ b/Register.cs
@@ -40,9 +40,9 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using DiscImageChef.CommonTypes.Interfaces;
+using Aaru.CommonTypes.Interfaces;
 
-namespace DiscImageChef.Checksums
+namespace Aaru.Checksums
 {
     public class Register : IPluginRegister
     {
diff --git a/SHA1Context.cs b/SHA1Context.cs
index ea81a8430..41480aa78 100644
--- a/SHA1Context.cs
+++ b/SHA1Context.cs
@@ -33,9 +33,9 @@
 using System.IO;
 using System.Security.Cryptography;
 using System.Text;
-using DiscImageChef.CommonTypes.Interfaces;
+using Aaru.CommonTypes.Interfaces;
 
-namespace DiscImageChef.Checksums
+namespace Aaru.Checksums
 {
     /// <summary>
     ///     Wraps up .NET SHA1 implementation to a Init(), Update(), Final() context.
diff --git a/SHA256Context.cs b/SHA256Context.cs
index 62406d068..3f95295ff 100644
--- a/SHA256Context.cs
+++ b/SHA256Context.cs
@@ -33,9 +33,9 @@
 using System.IO;
 using System.Security.Cryptography;
 using System.Text;
-using DiscImageChef.CommonTypes.Interfaces;
+using Aaru.CommonTypes.Interfaces;
 
-namespace DiscImageChef.Checksums
+namespace Aaru.Checksums
 {
     /// <summary>
     ///     Wraps up .NET SHA256 implementation to a Init(), Update(), Final() context.
diff --git a/SHA384Context.cs b/SHA384Context.cs
index 2939a0952..6f2246fcc 100644
--- a/SHA384Context.cs
+++ b/SHA384Context.cs
@@ -33,9 +33,9 @@
 using System.IO;
 using System.Security.Cryptography;
 using System.Text;
-using DiscImageChef.CommonTypes.Interfaces;
+using Aaru.CommonTypes.Interfaces;
 
-namespace DiscImageChef.Checksums
+namespace Aaru.Checksums
 {
     /// <summary>
     ///     Wraps up .NET SHA384 implementation to a Init(), Update(), Final() context.
diff --git a/SHA512Context.cs b/SHA512Context.cs
index 2f1c57ed3..10941dc2b 100644
--- a/SHA512Context.cs
+++ b/SHA512Context.cs
@@ -33,9 +33,9 @@
 using System.IO;
 using System.Security.Cryptography;
 using System.Text;
-using DiscImageChef.CommonTypes.Interfaces;
+using Aaru.CommonTypes.Interfaces;
 
-namespace DiscImageChef.Checksums
+namespace Aaru.Checksums
 {
     /// <summary>
     ///     Wraps up .NET SHA512 implementation to a Init(), Update(), Final() context.
diff --git a/SpamSumContext.cs b/SpamSumContext.cs
index 5b551e90e..ea21d26d7 100644
--- a/SpamSumContext.cs
+++ b/SpamSumContext.cs
@@ -42,9 +42,9 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Text;
-using DiscImageChef.CommonTypes.Interfaces;
+using Aaru.CommonTypes.Interfaces;
 
-namespace DiscImageChef.Checksums
+namespace Aaru.Checksums
 {
     /// <summary>
     ///     Implements the SpamSum fuzzy hashing algorithm.