diff --git a/ChangeLog b/ChangeLog
index f490b10..328bfbc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-01-16  Natalia Portillo  <claunia@claunia.com>
+
+	* MediaType.cs:
+	* DiscImageChef.CommonTypes.csproj:
+	  Refactor most disk references to media.
+
 2015-12-31  Natalia Portillo  <claunia@claunia.com>
 
 	* DiskType.cs:
diff --git a/DiscImageChef.CommonTypes.csproj b/DiscImageChef.CommonTypes.csproj
index 9244627..19f4a6a 100644
--- a/DiscImageChef.CommonTypes.csproj
+++ b/DiscImageChef.CommonTypes.csproj
@@ -35,7 +35,7 @@
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Partition.cs" />
-    <Compile Include="DiskType.cs" />
+    <Compile Include="MediaType.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/DiskType.cs b/MediaType.cs
similarity index 99%
rename from DiskType.cs
rename to MediaType.cs
index 0403712..7bca758 100644
--- a/DiskType.cs
+++ b/MediaType.cs
@@ -39,8 +39,8 @@ using System;
 
 namespace DiscImageChef.CommonTypes
 {
-    // Disk types
-    public enum DiskType
+    // Media (disk, cartridge, tape, cassette, etc) types
+    public enum MediaType
     {
         /// <summary>Unknown disk type</summary>
         Unknown,