diff --git a/Aaru.CommonTypes.csproj b/Aaru.CommonTypes.csproj
index 22cc330ac..9fdd9fd80 100644
--- a/Aaru.CommonTypes.csproj
+++ b/Aaru.CommonTypes.csproj
@@ -6,7 +6,7 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F2B84194-26EB-4227-B1C5-6602517E85AE}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <RootNamespace>DiscImageChef.CommonTypes</RootNamespace>
+    <RootNamespace>Aaru.CommonTypes</RootNamespace>
     <AssemblyName>Aaru.CommonTypes</AssemblyName>
     <ReleaseVersion>$(Version)</ReleaseVersion>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
diff --git a/Enums/DeviceType.cs b/Enums/DeviceType.cs
index 7672a456d..bdcf8d0ae 100644
--- a/Enums/DeviceType.cs
+++ b/Enums/DeviceType.cs
@@ -36,7 +36,7 @@
 // Copyright © 2011-2020 Natalia Portillo
 // ****************************************************************************/
 
-namespace DiscImageChef.CommonTypes.Enums
+namespace Aaru.CommonTypes.Enums
 {
     public enum DeviceType
     {
diff --git a/Enums/ErrorNumber.cs b/Enums/ErrorNumber.cs
index 789d0b658..90bfa36a3 100644
--- a/Enums/ErrorNumber.cs
+++ b/Enums/ErrorNumber.cs
@@ -36,7 +36,7 @@
 // Copyright © 2011-2020 Natalia Portillo
 // ****************************************************************************/
 
-namespace DiscImageChef.CommonTypes.Enums
+namespace Aaru.CommonTypes.Enums
 {
     /// <summary>Enumerates error codes. Positive for warnings or informative codes, negative for errors.</summary>
     public enum ErrorNumber
diff --git a/Enums/Images.cs b/Enums/Images.cs
index a1e1952c9..3aeb1e675 100644
--- a/Enums/Images.cs
+++ b/Enums/Images.cs
@@ -38,7 +38,7 @@
 
 using System;
 
-namespace DiscImageChef.CommonTypes.Enums
+namespace Aaru.CommonTypes.Enums
 {
     /// <summary>Track (as partitioning element) types.</summary>
     public enum TrackType : byte
diff --git a/Exceptions/Images.cs b/Exceptions/Images.cs
index c2afc0437..59d295413 100644
--- a/Exceptions/Images.cs
+++ b/Exceptions/Images.cs
@@ -39,7 +39,7 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace DiscImageChef.CommonTypes.Exceptions
+namespace Aaru.CommonTypes.Exceptions
 {
     /// <summary>Feature is supported by image but not implemented yet.</summary>
     [Serializable]
diff --git a/Extents/ExtentsByte.cs b/Extents/ExtentsByte.cs
index 91fdabc29..c95e07624 100644
--- a/Extents/ExtentsByte.cs
+++ b/Extents/ExtentsByte.cs
@@ -40,7 +40,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace DiscImageChef.CommonTypes.Extents
+namespace Aaru.CommonTypes.Extents
 {
     /// <summary>Implements extents for <see cref="byte" /></summary>
     public class ExtentsByte
diff --git a/Extents/ExtentsConverter.cs b/Extents/ExtentsConverter.cs
index 869ecf7c6..0decc4a9b 100644
--- a/Extents/ExtentsConverter.cs
+++ b/Extents/ExtentsConverter.cs
@@ -41,7 +41,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Schemas;
 
-namespace DiscImageChef.CommonTypes.Extents
+namespace Aaru.CommonTypes.Extents
 {
     public static class ExtentsConverter
     {
diff --git a/Extents/ExtentsInt.cs b/Extents/ExtentsInt.cs
index 878c6e53b..c1c8ac84b 100644
--- a/Extents/ExtentsInt.cs
+++ b/Extents/ExtentsInt.cs
@@ -40,7 +40,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace DiscImageChef.CommonTypes.Extents
+namespace Aaru.CommonTypes.Extents
 {
     /// <summary>Implements extents for <see cref="int" /></summary>
     public class ExtentsInt
diff --git a/Extents/ExtentsLong.cs b/Extents/ExtentsLong.cs
index 08a135da9..42e334643 100644
--- a/Extents/ExtentsLong.cs
+++ b/Extents/ExtentsLong.cs
@@ -40,7 +40,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace DiscImageChef.CommonTypes.Extents
+namespace Aaru.CommonTypes.Extents
 {
     /// <summary>Implements extents for <see cref="long" /></summary>
     public class ExtentsLong
diff --git a/Extents/ExtentsSByte.cs b/Extents/ExtentsSByte.cs
index d9aec06a5..d84be4388 100644
--- a/Extents/ExtentsSByte.cs
+++ b/Extents/ExtentsSByte.cs
@@ -40,7 +40,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace DiscImageChef.CommonTypes.Extents
+namespace Aaru.CommonTypes.Extents
 {
     /// <summary>Implements extents for <see cref="sbyte" /></summary>
     public class ExtentsSByte
diff --git a/Extents/ExtentsShort.cs b/Extents/ExtentsShort.cs
index 02716fcb3..1dc10f750 100644
--- a/Extents/ExtentsShort.cs
+++ b/Extents/ExtentsShort.cs
@@ -40,7 +40,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace DiscImageChef.CommonTypes.Extents
+namespace Aaru.CommonTypes.Extents
 {
     /// <summary>Implements extents for <see cref="short" /></summary>
     public class ExtentsShort
diff --git a/Extents/ExtentsUInt.cs b/Extents/ExtentsUInt.cs
index ba2ea979e..37fe87f14 100644
--- a/Extents/ExtentsUInt.cs
+++ b/Extents/ExtentsUInt.cs
@@ -40,7 +40,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace DiscImageChef.CommonTypes.Extents
+namespace Aaru.CommonTypes.Extents
 {
     /// <summary>Implements extents for <see cref="uint" /></summary>
     public class ExtentsUInt
diff --git a/Extents/ExtentsULong.cs b/Extents/ExtentsULong.cs
index 70f62e999..dbf86b7ec 100644
--- a/Extents/ExtentsULong.cs
+++ b/Extents/ExtentsULong.cs
@@ -40,7 +40,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace DiscImageChef.CommonTypes.Extents
+namespace Aaru.CommonTypes.Extents
 {
     /// <summary>Implements extents for <see cref="ulong" /></summary>
     public class ExtentsULong
diff --git a/Extents/ExtentsUShort.cs b/Extents/ExtentsUShort.cs
index 49d921c69..b99703a6d 100644
--- a/Extents/ExtentsUShort.cs
+++ b/Extents/ExtentsUShort.cs
@@ -40,7 +40,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace DiscImageChef.CommonTypes.Extents
+namespace Aaru.CommonTypes.Extents
 {
     /// <summary>Implements extents for <see cref="ushort" /></summary>
     public class ExtentsUShort
diff --git a/Filters.cs b/Filters.cs
index 2acb63bec..fd3060847 100644
--- a/Filters.cs
+++ b/Filters.cs
@@ -41,10 +41,10 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
-using DiscImageChef.CommonTypes.Interfaces;
-using DiscImageChef.Console;
+using Aaru.CommonTypes.Interfaces;
+using Aaru.Console;
 
-namespace DiscImageChef.CommonTypes
+namespace Aaru.CommonTypes
 {
     public class FiltersList
     {
diff --git a/Geometry.cs b/Geometry.cs
index fb329144e..1e9e2d411 100644
--- a/Geometry.cs
+++ b/Geometry.cs
@@ -38,7 +38,7 @@
 
 using System.Linq;
 
-namespace DiscImageChef.CommonTypes
+namespace Aaru.CommonTypes
 {
     public static class Geometry
     {
diff --git a/Interfaces/IArchive.cs b/Interfaces/IArchive.cs
index 639c7e209..3d6928d60 100644
--- a/Interfaces/IArchive.cs
+++ b/Interfaces/IArchive.cs
@@ -35,7 +35,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 
-namespace DiscImageChef.CommonTypes.Interfaces
+namespace Aaru.CommonTypes.Interfaces
 {
     [Flags]
     public enum ArchiveSupportedFeature : uint
diff --git a/Interfaces/IChecksum.cs b/Interfaces/IChecksum.cs
index 90cce9871..a963552ae 100644
--- a/Interfaces/IChecksum.cs
+++ b/Interfaces/IChecksum.cs
@@ -36,7 +36,7 @@
 // Copyright © 2011-2020 Natalia Portillo
 // ****************************************************************************/
 
-namespace DiscImageChef.CommonTypes.Interfaces
+namespace Aaru.CommonTypes.Interfaces
 {
     public interface IChecksum
     {
diff --git a/Interfaces/IFilesystem.cs b/Interfaces/IFilesystem.cs
index e9a20e8b2..5df7b8874 100644
--- a/Interfaces/IFilesystem.cs
+++ b/Interfaces/IFilesystem.cs
@@ -40,7 +40,7 @@ using System;
 using System.Text;
 using Schemas;
 
-namespace DiscImageChef.CommonTypes.Interfaces
+namespace Aaru.CommonTypes.Interfaces
 {
     /// <summary>Interface to implement filesystem plugins.</summary>
     public interface IFilesystem
diff --git a/Interfaces/IFilter.cs b/Interfaces/IFilter.cs
index 0a2c81c28..7ba9e0849 100644
--- a/Interfaces/IFilter.cs
+++ b/Interfaces/IFilter.cs
@@ -39,7 +39,7 @@
 using System;
 using System.IO;
 
-namespace DiscImageChef.CommonTypes.Interfaces
+namespace Aaru.CommonTypes.Interfaces
 {
     public interface IFilter
     {
diff --git a/Interfaces/IFloppyImage.cs b/Interfaces/IFloppyImage.cs
index dba190a41..17b8ad712 100644
--- a/Interfaces/IFloppyImage.cs
+++ b/Interfaces/IFloppyImage.cs
@@ -36,10 +36,10 @@
 // Copyright © 2011-2020 Natalia Portillo
 // ****************************************************************************/
 
-using DiscImageChef.CommonTypes.Enums;
-using DiscImageChef.CommonTypes.Structs;
+using Aaru.CommonTypes.Enums;
+using Aaru.CommonTypes.Structs;
 
-namespace DiscImageChef.CommonTypes.Interfaces
+namespace Aaru.CommonTypes.Interfaces
 {
     /// <summary>
     ///     Abstract class to implement disk image reading plugins that can contain floppy images. This interface is
diff --git a/Interfaces/IMediaImage.cs b/Interfaces/IMediaImage.cs
index 6a9971fb3..11576b90a 100644
--- a/Interfaces/IMediaImage.cs
+++ b/Interfaces/IMediaImage.cs
@@ -39,11 +39,11 @@
 
 using System;
 using System.Collections.Generic;
-using DiscImageChef.CommonTypes.Enums;
-using DiscImageChef.CommonTypes.Structs;
+using Aaru.CommonTypes.Enums;
+using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace DiscImageChef.CommonTypes.Interfaces
+namespace Aaru.CommonTypes.Interfaces
 {
     /// <summary>Abstract class to implement disk image reading plugins.</summary>
     public interface IMediaImage
diff --git a/Interfaces/IOpticalMediaImage.cs b/Interfaces/IOpticalMediaImage.cs
index 0d7ecdfc2..9226dc35c 100644
--- a/Interfaces/IOpticalMediaImage.cs
+++ b/Interfaces/IOpticalMediaImage.cs
@@ -37,10 +37,10 @@
 // ****************************************************************************/
 
 using System.Collections.Generic;
-using DiscImageChef.CommonTypes.Enums;
-using DiscImageChef.CommonTypes.Structs;
+using Aaru.CommonTypes.Enums;
+using Aaru.CommonTypes.Structs;
 
-namespace DiscImageChef.CommonTypes.Interfaces
+namespace Aaru.CommonTypes.Interfaces
 {
     /// <summary>Abstract class to implement disk image reading plugins.</summary>
     public interface IOpticalMediaImage : IMediaImage, IPartitionableMediaImage, IVerifiableSectorsImage
diff --git a/Interfaces/IPartition.cs b/Interfaces/IPartition.cs
index 530e6760d..4ba39aa2f 100644
--- a/Interfaces/IPartition.cs
+++ b/Interfaces/IPartition.cs
@@ -39,10 +39,10 @@
 
 using System;
 using System.Collections.Generic;
-using DiscImageChef.CommonTypes;
-using DiscImageChef.CommonTypes.Interfaces;
+using Aaru.CommonTypes;
+using Aaru.CommonTypes.Interfaces;
 
-namespace DiscImageChef.Partitions
+namespace Aaru.Partitions
 {
     /// <summary>Abstract class to implement partitioning schemes interpreting plugins.</summary>
     public interface IPartition
diff --git a/Interfaces/IPartitionableMediaImage.cs b/Interfaces/IPartitionableMediaImage.cs
index 93c3facc5..335ddd90d 100644
--- a/Interfaces/IPartitionableMediaImage.cs
+++ b/Interfaces/IPartitionableMediaImage.cs
@@ -39,7 +39,7 @@
 
 using System.Collections.Generic;
 
-namespace DiscImageChef.CommonTypes.Interfaces
+namespace Aaru.CommonTypes.Interfaces
 {
     public interface IPartitionableMediaImage
     {
diff --git a/Interfaces/IPluginRegister.cs b/Interfaces/IPluginRegister.cs
index 478cc1803..7af597acf 100644
--- a/Interfaces/IPluginRegister.cs
+++ b/Interfaces/IPluginRegister.cs
@@ -39,7 +39,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace DiscImageChef.CommonTypes.Interfaces
+namespace Aaru.CommonTypes.Interfaces
 {
     public interface IPluginRegister
     {
diff --git a/Interfaces/IReadOnlyFilesystem.cs b/Interfaces/IReadOnlyFilesystem.cs
index 4594f568b..619329858 100644
--- a/Interfaces/IReadOnlyFilesystem.cs
+++ b/Interfaces/IReadOnlyFilesystem.cs
@@ -40,9 +40,9 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using DiscImageChef.CommonTypes.Structs;
+using Aaru.CommonTypes.Structs;
 
-namespace DiscImageChef.CommonTypes.Interfaces
+namespace Aaru.CommonTypes.Interfaces
 {
     /// <summary>Interface to implement filesystem plugins.</summary>
     public interface IReadOnlyFilesystem : IFilesystem
diff --git a/Interfaces/ITapeImage.cs b/Interfaces/ITapeImage.cs
index 7ee634912..698afc54f 100644
--- a/Interfaces/ITapeImage.cs
+++ b/Interfaces/ITapeImage.cs
@@ -38,9 +38,9 @@
 // ****************************************************************************/
 
 using System.Collections.Generic;
-using DiscImageChef.CommonTypes.Structs;
+using Aaru.CommonTypes.Structs;
 
-namespace DiscImageChef.CommonTypes.Interfaces
+namespace Aaru.CommonTypes.Interfaces
 {
     public interface ITapeImage : IMediaImage
     {
diff --git a/Interfaces/IVerifiableImage.cs b/Interfaces/IVerifiableImage.cs
index 48313f34f..9f848499f 100644
--- a/Interfaces/IVerifiableImage.cs
+++ b/Interfaces/IVerifiableImage.cs
@@ -37,7 +37,7 @@
 // Copyright © 2011-2020 Natalia Portillo
 // ****************************************************************************/
 
-namespace DiscImageChef.CommonTypes.Interfaces
+namespace Aaru.CommonTypes.Interfaces
 {
     public interface IVerifiableImage
     {
diff --git a/Interfaces/IVerifiableSectorsImage.cs b/Interfaces/IVerifiableSectorsImage.cs
index 6171e50cf..6362fee14 100644
--- a/Interfaces/IVerifiableSectorsImage.cs
+++ b/Interfaces/IVerifiableSectorsImage.cs
@@ -39,7 +39,7 @@
 
 using System.Collections.Generic;
 
-namespace DiscImageChef.CommonTypes.Interfaces
+namespace Aaru.CommonTypes.Interfaces
 {
     public interface IVerifiableSectorsImage
     {
diff --git a/Interfaces/IWritableFloppyImage.cs b/Interfaces/IWritableFloppyImage.cs
index 960491ff8..eb2075b71 100644
--- a/Interfaces/IWritableFloppyImage.cs
+++ b/Interfaces/IWritableFloppyImage.cs
@@ -36,10 +36,10 @@
 // Copyright © 2011-2020 Natalia Portillo
 // ****************************************************************************/
 
-using DiscImageChef.CommonTypes.Enums;
-using DiscImageChef.CommonTypes.Structs;
+using Aaru.CommonTypes.Enums;
+using Aaru.CommonTypes.Structs;
 
-namespace DiscImageChef.CommonTypes.Interfaces
+namespace Aaru.CommonTypes.Interfaces
 {
     /// <summary>
     ///     Abstract class to implement disk image reading plugins that can contain floppy images. This interface is
diff --git a/Interfaces/IWritableImage.cs b/Interfaces/IWritableImage.cs
index 3aef61f2c..d26b3f5d0 100644
--- a/Interfaces/IWritableImage.cs
+++ b/Interfaces/IWritableImage.cs
@@ -38,11 +38,11 @@
 
 using System;
 using System.Collections.Generic;
-using DiscImageChef.CommonTypes.Enums;
-using DiscImageChef.CommonTypes.Structs;
+using Aaru.CommonTypes.Enums;
+using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace DiscImageChef.CommonTypes.Interfaces
+namespace Aaru.CommonTypes.Interfaces
 {
     /// <summary>
     ///     Abstract class to implement disk image writing plugins. TODO: This interface is subject to change until
diff --git a/Interfaces/IWritableOpticalImage.cs b/Interfaces/IWritableOpticalImage.cs
index 3ef754f42..6bedf3fa8 100644
--- a/Interfaces/IWritableOpticalImage.cs
+++ b/Interfaces/IWritableOpticalImage.cs
@@ -37,9 +37,9 @@
 // ****************************************************************************/
 
 using System.Collections.Generic;
-using DiscImageChef.CommonTypes.Structs;
+using Aaru.CommonTypes.Structs;
 
-namespace DiscImageChef.CommonTypes.Interfaces
+namespace Aaru.CommonTypes.Interfaces
 {
     public interface IWritableOpticalImage : IWritableImage, IOpticalMediaImage
     {
diff --git a/Interfaces/IWritableTapeImage.cs b/Interfaces/IWritableTapeImage.cs
index 847bd58aa..5191731b2 100644
--- a/Interfaces/IWritableTapeImage.cs
+++ b/Interfaces/IWritableTapeImage.cs
@@ -37,9 +37,9 @@
 // Copyright © 2011-2020 Natalia Portillo
 // ****************************************************************************/
 
-using DiscImageChef.CommonTypes.Structs;
+using Aaru.CommonTypes.Structs;
 
-namespace DiscImageChef.CommonTypes.Interfaces
+namespace Aaru.CommonTypes.Interfaces
 {
     public interface IWritableTapeImage : ITapeImage, IWritableImage
     {
diff --git a/Interop/DetectOS.cs b/Interop/DetectOS.cs
index dafa37c22..a5fb89b76 100644
--- a/Interop/DetectOS.cs
+++ b/Interop/DetectOS.cs
@@ -42,7 +42,7 @@ using System.IO;
 using System.Runtime.InteropServices;
 using System.Security.Principal;
 
-namespace DiscImageChef.CommonTypes.Interop
+namespace Aaru.CommonTypes.Interop
 {
     public static class DetectOS
     {
diff --git a/Interop/PlatformID.cs b/Interop/PlatformID.cs
index 214f0d522..aebd39809 100644
--- a/Interop/PlatformID.cs
+++ b/Interop/PlatformID.cs
@@ -36,7 +36,7 @@
 // Copyright © 2011-2020 Natalia Portillo
 // ****************************************************************************/
 
-namespace DiscImageChef.CommonTypes.Interop
+namespace Aaru.CommonTypes.Interop
 {
     /// <summary>Contains an arbitrary list of OSes, even if .NET does not run on them</summary>
     public enum PlatformID
diff --git a/Interop/Version.cs b/Interop/Version.cs
index 541d0814f..106c681fa 100644
--- a/Interop/Version.cs
+++ b/Interop/Version.cs
@@ -40,7 +40,7 @@ using System;
 using System.Reflection;
 using System.Runtime;
 
-namespace DiscImageChef.CommonTypes.Interop
+namespace Aaru.CommonTypes.Interop
 {
     public static class Version
     {
diff --git a/MediaType.cs b/MediaType.cs
index 3012391e2..e003970bd 100644
--- a/MediaType.cs
+++ b/MediaType.cs
@@ -41,7 +41,7 @@
 
 using System;
 
-namespace DiscImageChef.CommonTypes
+namespace Aaru.CommonTypes
 {
     public enum MediaEncoding
     {
diff --git a/MediaTypeFromDevice.cs b/MediaTypeFromDevice.cs
index f6df6cc27..869b9bf70 100644
--- a/MediaTypeFromDevice.cs
+++ b/MediaTypeFromDevice.cs
@@ -38,7 +38,7 @@
 
 using System;
 
-namespace DiscImageChef.CommonTypes
+namespace Aaru.CommonTypes
 {
     #pragma warning disable RECS0063 // Warns when a culture-aware 'StartsWith' call is used by default.
     public static class MediaTypeFromDevice
diff --git a/Metadata/CdOffset.cs b/Metadata/CdOffset.cs
index 1d0186ca8..992313f53 100644
--- a/Metadata/CdOffset.cs
+++ b/Metadata/CdOffset.cs
@@ -38,7 +38,7 @@
 
 using System.ComponentModel.DataAnnotations;
 
-namespace DiscImageChef.CommonTypes.Metadata
+namespace Aaru.CommonTypes.Metadata
 {
     public class CdOffset
     {
diff --git a/Metadata/DeviceReport.cs b/Metadata/DeviceReport.cs
index 12ab15e42..f6e1c6a68 100644
--- a/Metadata/DeviceReport.cs
+++ b/Metadata/DeviceReport.cs
@@ -39,15 +39,15 @@
 using System;
 using System.ComponentModel;
 using System.Xml.Serialization;
-using DiscImageChef.CommonTypes.Structs.Devices.ATA;
-using DiscImageChef.CommonTypes.Structs.Devices.SCSI;
-using DiscImageChef.CommonTypes.Structs.Devices.SCSI.Modes;
+using Aaru.CommonTypes.Structs.Devices.ATA;
+using Aaru.CommonTypes.Structs.Devices.SCSI;
+using Aaru.CommonTypes.Structs.Devices.SCSI.Modes;
 using Newtonsoft.Json;
 
 // ReSharper disable InconsistentNaming
 // ReSharper disable UnusedAutoPropertyAccessor.Global
 
-namespace DiscImageChef.CommonTypes.Metadata
+namespace Aaru.CommonTypes.Metadata
 {
     [Serializable, XmlRoot("DicDeviceReport", Namespace = "", IsNullable = false)]
     public class DeviceReport
diff --git a/Metadata/DeviceReportV2.cs b/Metadata/DeviceReportV2.cs
index b047bf1a1..ac81ab2bf 100644
--- a/Metadata/DeviceReportV2.cs
+++ b/Metadata/DeviceReportV2.cs
@@ -42,10 +42,10 @@ using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text;
-using DiscImageChef.CommonTypes.Enums;
-using DiscImageChef.CommonTypes.Structs.Devices.ATA;
-using DiscImageChef.CommonTypes.Structs.Devices.SCSI;
-using DiscImageChef.CommonTypes.Structs.Devices.SCSI.Modes;
+using Aaru.CommonTypes.Enums;
+using Aaru.CommonTypes.Structs.Devices.ATA;
+using Aaru.CommonTypes.Structs.Devices.SCSI;
+using Aaru.CommonTypes.Structs.Devices.SCSI.Modes;
 using Newtonsoft.Json;
 
 // ReSharper disable VirtualMemberNeverOverridden.Global
@@ -54,7 +54,7 @@ using Newtonsoft.Json;
 // ReSharper disable InconsistentNaming
 // ReSharper disable UnusedAutoPropertyAccessor.Global
 
-namespace DiscImageChef.CommonTypes.Metadata
+namespace Aaru.CommonTypes.Metadata
 {
     public class DeviceReportV2
     {
diff --git a/Metadata/Dimensions.cs b/Metadata/Dimensions.cs
index c4e918f01..dea2fade2 100644
--- a/Metadata/Dimensions.cs
+++ b/Metadata/Dimensions.cs
@@ -38,7 +38,7 @@
 
 using Schemas;
 
-namespace DiscImageChef.CommonTypes.Metadata
+namespace Aaru.CommonTypes.Metadata
 {
     public static class Dimensions
     {
diff --git a/Metadata/MediaType.cs b/Metadata/MediaType.cs
index d326bbae4..9bde3404d 100644
--- a/Metadata/MediaType.cs
+++ b/Metadata/MediaType.cs
@@ -36,7 +36,7 @@
 // Copyright © 2011-2020 Natalia Portillo
 // ****************************************************************************/
 
-namespace DiscImageChef.CommonTypes.Metadata
+namespace Aaru.CommonTypes.Metadata
 {
     public static class MediaType
     {
diff --git a/Metadata/Resume.cs b/Metadata/Resume.cs
index de2ae4832..21312da65 100644
--- a/Metadata/Resume.cs
+++ b/Metadata/Resume.cs
@@ -41,7 +41,7 @@ using System.Collections.Generic;
 using System.Xml.Serialization;
 using Schemas;
 
-namespace DiscImageChef.CommonTypes.Metadata
+namespace Aaru.CommonTypes.Metadata
 {
     [Serializable, XmlRoot("DicResume", Namespace = "", IsNullable = false)]
     public class Resume
diff --git a/Metadata/Statistics.cs b/Metadata/Statistics.cs
index 640690b3d..40db2e98a 100644
--- a/Metadata/Statistics.cs
+++ b/Metadata/Statistics.cs
@@ -39,7 +39,7 @@
 using System.Collections.Generic;
 using System.Xml.Serialization;
 
-namespace DiscImageChef.CommonTypes.Metadata
+namespace Aaru.CommonTypes.Metadata
 {
     [XmlRoot("DicStats", Namespace = "", IsNullable = false)]
     public class Stats
diff --git a/Metadata/Version.cs b/Metadata/Version.cs
index d561ab471..15b8c878f 100644
--- a/Metadata/Version.cs
+++ b/Metadata/Version.cs
@@ -36,10 +36,10 @@
 // Copyright © 2011-2020 Natalia Portillo
 // ****************************************************************************/
 
-using DiscImageChef.CommonTypes.Interop;
+using Aaru.CommonTypes.Interop;
 using Schemas;
 
-namespace DiscImageChef.CommonTypes.Metadata
+namespace Aaru.CommonTypes.Metadata
 {
     public static class Version
     {
diff --git a/Partition.cs b/Partition.cs
index bfe137ee5..217c831cf 100644
--- a/Partition.cs
+++ b/Partition.cs
@@ -38,7 +38,7 @@
 
 using System;
 
-namespace DiscImageChef.CommonTypes
+namespace Aaru.CommonTypes
 {
     /// <summary>Partition structure.</summary>
     public struct Partition : IEquatable<Partition>, IComparable<Partition>
diff --git a/PluginBase.cs b/PluginBase.cs
index f7e9d3d75..157ccd25a 100644
--- a/PluginBase.cs
+++ b/PluginBase.cs
@@ -39,10 +39,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using DiscImageChef.CommonTypes.Interfaces;
-using DiscImageChef.Partitions;
+using Aaru.CommonTypes.Interfaces;
+using Aaru.Partitions;
 
-namespace DiscImageChef.CommonTypes
+namespace Aaru.CommonTypes
 {
     /// <summary>Contain all plugins (filesystem, partition and image)</summary>
     public class PluginBase
diff --git a/Structs/Devices/ATA/Identify.cs b/Structs/Devices/ATA/Identify.cs
index 11cdf4867..8b319b9eb 100644
--- a/Structs/Devices/ATA/Identify.cs
+++ b/Structs/Devices/ATA/Identify.cs
@@ -3,10 +3,10 @@ using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
 using System.Text;
-using DiscImageChef.Console;
-using Marshal = DiscImageChef.Helpers.Marshal;
+using Aaru.Console;
+using Marshal = Aaru.Helpers.Marshal;
 
-namespace DiscImageChef.CommonTypes.Structs.Devices.ATA
+namespace Aaru.CommonTypes.Structs.Devices.ATA
 {
     /// <summary>
     ///     Information from following standards: T10-791D rev. 4c (ATA) T10-948D rev. 4c (ATA-2) T13-1153D rev. 18
diff --git a/Structs/Devices/SCSI/Enums.cs b/Structs/Devices/SCSI/Enums.cs
index 8b1131029..83ba794bb 100644
--- a/Structs/Devices/SCSI/Enums.cs
+++ b/Structs/Devices/SCSI/Enums.cs
@@ -32,7 +32,7 @@
 
 using System.Diagnostics.CodeAnalysis;
 
-namespace DiscImageChef.CommonTypes.Structs.Devices.SCSI
+namespace Aaru.CommonTypes.Structs.Devices.SCSI
 {
     public enum PeripheralQualifiers : byte
     {
diff --git a/Structs/Devices/SCSI/Inquiry.cs b/Structs/Devices/SCSI/Inquiry.cs
index d359691e2..3267f8892 100644
--- a/Structs/Devices/SCSI/Inquiry.cs
+++ b/Structs/Devices/SCSI/Inquiry.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using DiscImageChef.Console;
+using Aaru.Console;
 
-namespace DiscImageChef.CommonTypes.Structs.Devices.SCSI
+namespace Aaru.CommonTypes.Structs.Devices.SCSI
 {
     /// <summary>
     ///     Information from the following standards: T9/375-D revision 10l T10/995-D revision 10 T10/1236-D revision 20
diff --git a/Structs/Devices/SCSI/Modes/2A.cs b/Structs/Devices/SCSI/Modes/2A.cs
index e35876b9a..cae042c65 100644
--- a/Structs/Devices/SCSI/Modes/2A.cs
+++ b/Structs/Devices/SCSI/Modes/2A.cs
@@ -35,7 +35,7 @@ using System.ComponentModel.DataAnnotations;
 using System.Diagnostics.CodeAnalysis;
 using Newtonsoft.Json;
 
-namespace DiscImageChef.CommonTypes.Structs.Devices.SCSI.Modes
+namespace Aaru.CommonTypes.Structs.Devices.SCSI.Modes
 {
     [SuppressMessage("ReSharper", "InconsistentNaming"), SuppressMessage("ReSharper", "MemberCanBeInternal"),
      SuppressMessage("ReSharper", "MemberCanBePrivate.Global"), SuppressMessage("ReSharper", "NotAccessedField.Global")]
diff --git a/Structs/Filesystems.cs b/Structs/Filesystems.cs
index 1f34420f4..73dedbaf4 100644
--- a/Structs/Filesystems.cs
+++ b/Structs/Filesystems.cs
@@ -40,7 +40,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace DiscImageChef.CommonTypes.Structs
+namespace Aaru.CommonTypes.Structs
 {
     /// <summary>File attributes.</summary>
     [Flags]
diff --git a/Structs/Images.cs b/Structs/Images.cs
index 61b0b41eb..188d4e483 100644
--- a/Structs/Images.cs
+++ b/Structs/Images.cs
@@ -38,10 +38,10 @@
 
 using System;
 using System.Collections.Generic;
-using DiscImageChef.CommonTypes.Enums;
-using DiscImageChef.CommonTypes.Interfaces;
+using Aaru.CommonTypes.Enums;
+using Aaru.CommonTypes.Interfaces;
 
-namespace DiscImageChef.CommonTypes.Structs
+namespace Aaru.CommonTypes.Structs
 {
     /// <summary>Contains information about a dump image and its contents</summary>
     public struct ImageInfo
diff --git a/Structs/TapeFile.cs b/Structs/TapeFile.cs
index fa223b368..a789d2f86 100644
--- a/Structs/TapeFile.cs
+++ b/Structs/TapeFile.cs
@@ -36,7 +36,7 @@
 // Copyright © 2011-2020 Natalia Portillo
 // ****************************************************************************/
 
-namespace DiscImageChef.CommonTypes.Structs
+namespace Aaru.CommonTypes.Structs
 {
     public struct TapeFile
     {
diff --git a/Structs/TapePartition.cs b/Structs/TapePartition.cs
index 6dc88aec6..faf98a6b2 100644
--- a/Structs/TapePartition.cs
+++ b/Structs/TapePartition.cs
@@ -36,7 +36,7 @@
 // Copyright © 2011-2020 Natalia Portillo
 // ****************************************************************************/
 
-namespace DiscImageChef.CommonTypes.Structs
+namespace Aaru.CommonTypes.Structs
 {
     public struct TapePartition
     {