diff --git a/libcorpus2_whole/CMakeLists.txt b/libcorpus2_whole/CMakeLists.txt
index 004e1a12d19ed1ee1a5c1347e13494d6dd067c16..e4f6ca987c7e19c00b239ed53ac4f8f4f859f433 100644
--- a/libcorpus2_whole/CMakeLists.txt
+++ b/libcorpus2_whole/CMakeLists.txt
@@ -9,11 +9,13 @@ SET(libcorpus2_whole_SRC
 	corpus.cpp
 	document.cpp
 	relation.cpp
-	io/corpusreader.cpp
-	io/docreader.cpp
-	io/docreaderi.h
-	io/poliqarpdocumentreader.cpp
+	io/reader_i.h
 	io/relreader.cpp
+	io/documentreader.cpp
+	io/documentcorpusreader.cpp
+	io/poliqarpdocumentreader.cpp
+	io/poliqarpcorpusreader.cpp
+	io/corpusreader.cpp
 )
 
 file(GLOB_RECURSE INCS "*.h")
diff --git a/libcorpus2_whole/io/corpusreader.cpp b/libcorpus2_whole/io/documentcorpusreader.cpp
similarity index 100%
rename from libcorpus2_whole/io/corpusreader.cpp
rename to libcorpus2_whole/io/documentcorpusreader.cpp
diff --git a/libcorpus2_whole/io/corpusreader.h b/libcorpus2_whole/io/documentcorpusreader.h
similarity index 100%
rename from libcorpus2_whole/io/corpusreader.h
rename to libcorpus2_whole/io/documentcorpusreader.h
diff --git a/libcorpus2_whole/io/docreader.cpp b/libcorpus2_whole/io/documentreader.cpp
similarity index 100%
rename from libcorpus2_whole/io/docreader.cpp
rename to libcorpus2_whole/io/documentreader.cpp
diff --git a/libcorpus2_whole/io/docreader.h b/libcorpus2_whole/io/documentreader.h
similarity index 100%
rename from libcorpus2_whole/io/docreader.h
rename to libcorpus2_whole/io/documentreader.h
diff --git a/libcorpus2_whole/io/docreaderi.h b/libcorpus2_whole/io/reader_i.h
similarity index 100%
rename from libcorpus2_whole/io/docreaderi.h
rename to libcorpus2_whole/io/reader_i.h