--- a/Core/FileStorage/FileInfo.h	Fri Nov 30 14:22:27 2012 +0100
+++ b/Core/FileStorage/FileInfo.h	Fri Nov 30 14:30:05 2012 +0100
@@ -42,9 +42,9 @@
   {
   private:
     std::string uuid_;
-    FileType type_;
+    FileContentType contentType_;
     uint64_t uncompressedSize_;
-    CompressionType compression_;
+    CompressionType compressionType_;
     uint64_t compressedSize_;
 
   public:
@@ -56,12 +56,12 @@
      * Constructor for an uncompressed attachment.
      **/
     FileInfo(const std::string& uuid,
-             FileType type,
+             FileContentType contentType,
              uint64_t size) :
       uuid_(uuid),
-      type_(type),
+      contentType_(contentType),
       uncompressedSize_(size),
-      compression_(CompressionType_None),
+      compressionType_(CompressionType_None),
       compressedSize_(size)
     {
     }
@@ -70,14 +70,14 @@
      * Constructor for a compressed attachment.
      **/
     FileInfo(const std::string& uuid,
-             FileType type,
+             FileContentType contentType,
              uint64_t uncompressedSize,
-             CompressionType compression,
+             CompressionType compressionType,
              uint64_t compressedSize) :
       uuid_(uuid),
-      type_(type),
+      contentType_(contentType),
       uncompressedSize_(uncompressedSize),
-      compression_(compression),
+      compressionType_(compressionType),
       compressedSize_(compressedSize)
     {
     }
@@ -87,9 +87,9 @@
       return uuid_;
     }
 
-    FileType GetFileType() const
+    FileContentType GetContentType() const
     {
-      return type_;
+      return contentType_;
     }
 
     uint64_t GetUncompressedSize() const
@@ -99,7 +99,7 @@
 
     CompressionType GetCompressionType() const
     {
-      return compression_;
+      return compressionType_;
     }
 
     uint64_t GetCompressedSize() const