diff --git a/application/controllers/ListController.php b/application/controllers/ListController.php
index 599df06a1..a618cbaf9 100644
--- a/application/controllers/ListController.php
+++ b/application/controllers/ListController.php
@@ -8,7 +8,7 @@ use Icinga\Web\Url;
 use Icinga\Data\ResourceFactory;
 use Icinga\Logger\Logger;
 use Icinga\Logger\Writer\FileWriter;
-use Icinga\Protocol\File\Reader as FileReader;
+use Icinga\Protocol\File\FileReader;
 
 /**
  * Class ListController
diff --git a/library/Icinga/Data/ResourceFactory.php b/library/Icinga/Data/ResourceFactory.php
index 66127ff03..30597ad2d 100644
--- a/library/Icinga/Data/ResourceFactory.php
+++ b/library/Icinga/Data/ResourceFactory.php
@@ -12,7 +12,7 @@ use Icinga\Data\Db\DbConnection;
 use Icinga\Protocol\Livestatus\Connection as LivestatusConnection;
 use Icinga\Protocol\Statusdat\Reader as StatusdatReader;
 use Icinga\Protocol\Ldap\Connection as LdapConnection;
-use Icinga\Protocol\File\Reader as FileReader;
+use Icinga\Protocol\File\FileReader;
 
 /**
  * Create resources from names or resource configuration
diff --git a/library/Icinga/Protocol/File/Reader.php b/library/Icinga/Protocol/File/FileReader.php
similarity index 99%
rename from library/Icinga/Protocol/File/Reader.php
rename to library/Icinga/Protocol/File/FileReader.php
index 0f5509b7b..abbcaa630 100644
--- a/library/Icinga/Protocol/File/Reader.php
+++ b/library/Icinga/Protocol/File/FileReader.php
@@ -13,7 +13,7 @@ use Icinga\Util\File;
 /**
  * Read file line by line
  */
-class Reader extends FilterIterator
+class FileReader extends FilterIterator
 {
     /**
      * A PCRE string with the fields to extract from the file's lines as named subpatterns
diff --git a/library/Icinga/Protocol/File/Query.php b/library/Icinga/Protocol/File/Query.php
index f88426bca..94c8a6af0 100644
--- a/library/Icinga/Protocol/File/Query.php
+++ b/library/Icinga/Protocol/File/Query.php
@@ -10,7 +10,7 @@ use Icinga\Data\Filter\Filter;
 /**
  * Class Query
  *
- * Query for Datasource Icinga\Protocol\File\Reader
+ * Query for Datasource Icinga\Protocol\File\FileReader
  *
  * @package Icinga\Protocol\File
  */