diff --git a/src/main/java/cz/it4i/qcmp/cache/ICacheFile.java b/src/main/java/cz/it4i/qcmp/cache/IQvcFile.java
similarity index 68%
rename from src/main/java/cz/it4i/qcmp/cache/ICacheFile.java
rename to src/main/java/cz/it4i/qcmp/cache/IQvcFile.java
index 80f4c2aa9313c0829cdd1b33397b8c4a0beae83d..7238c77afd80540091ed26bd6ba6342dde39ad26 100644
--- a/src/main/java/cz/it4i/qcmp/cache/ICacheFile.java
+++ b/src/main/java/cz/it4i/qcmp/cache/IQvcFile.java
@@ -1,20 +1,22 @@
 package cz.it4i.qcmp.cache;
 
+import cz.it4i.qcmp.fileformat.IQvcHeader;
 import cz.it4i.qcmp.fileformat.QvcHeaderV1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
+// TODO(Moravec): Rename to IQvcFile
 public interface ICacheFile {
 
     void writeToStream(DataOutputStream outputStream) throws IOException;
 
-    void readFromStream(DataInputStream inputStream) throws IOException;
+    void readFromStream(DataInputStream inputStream, IQvcHeader header) throws IOException;
 
     void readFromStream(DataInputStream inputStream, QvcHeaderV1 header) throws IOException;
 
-    QvcHeaderV1 getHeader();
+    IQvcHeader getHeader();
 
     void report(StringBuilder builder);
 
diff --git a/src/main/java/cz/it4i/qcmp/cache/SQCacheFile.java b/src/main/java/cz/it4i/qcmp/cache/SqQvcFile.java
similarity index 94%
rename from src/main/java/cz/it4i/qcmp/cache/SQCacheFile.java
rename to src/main/java/cz/it4i/qcmp/cache/SqQvcFile.java
index 5815ed0cd257ded9622e5a52c9fbd59b9045fa54..1565ef34167e9e579fb338a8fd7c8732b092421e 100644
--- a/src/main/java/cz/it4i/qcmp/cache/SQCacheFile.java
+++ b/src/main/java/cz/it4i/qcmp/cache/SqQvcFile.java
@@ -7,7 +7,7 @@ import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-public class SQCacheFile implements ICacheFile {
+public class SQCacheFile implements IQvcFile {
     private QvcHeaderV1 header;
     private SQCodebook codebook;
 
@@ -74,9 +74,4 @@ public class SQCacheFile implements ICacheFile {
             }
         }
     }
-
-    @Override
-    public String klass() {
-        return "SQCacheFile";
-    }
 }
diff --git a/src/main/java/cz/it4i/qcmp/cache/VQCacheFile.java b/src/main/java/cz/it4i/qcmp/cache/VqQvcFile.java
similarity index 95%
rename from src/main/java/cz/it4i/qcmp/cache/VQCacheFile.java
rename to src/main/java/cz/it4i/qcmp/cache/VqQvcFile.java
index ef7c26a759777db7862d89a22647d607769a3e99..1eb135964c69040541b80d19e096ca50a30248d0 100644
--- a/src/main/java/cz/it4i/qcmp/cache/VQCacheFile.java
+++ b/src/main/java/cz/it4i/qcmp/cache/VqQvcFile.java
@@ -7,7 +7,7 @@ import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-public class VQCacheFile implements ICacheFile {
+public class VQCacheFile implements IQvcFile {
     private QvcHeaderV1 header;
     private VQCodebook codebook;
 
@@ -83,9 +83,4 @@ public class VQCacheFile implements ICacheFile {
             builder.append("\n- - - - - - - - - - - - - - - - - - - - - - - - -\n");
         }
     }
-
-    @Override
-    public String klass() {
-        return "VQCacheFile";
-    }
 }