diff --git a/src/lib/include/jes/FileReader.h b/src/lib/include/jes/FileLoader.h
similarity index 90%
rename from src/lib/include/jes/FileReader.h
rename to src/lib/include/jes/FileLoader.h
index baf2aec..51f3e33 100644
--- a/src/lib/include/jes/FileReader.h
+++ b/src/lib/include/jes/FileLoader.h
@@ -8,7 +8,7 @@
 
 namespace jes
 {
-    class FileReader
+    class FileLoader
     {
     public:
         enum
@@ -19,8 +19,8 @@ namespace jes
             LINE_ENDING_COUNT
         };
 
-        FileReader();
-        ~FileReader();
+        FileLoader();
+        ~FileLoader();
         bool load(const char * fname);
         unsigned int num_lines()
         {
@@ -45,7 +45,7 @@ namespace jes
         int m_line_endings;
         LineIndexPairVectorRef m_lines;
     };
-    typedef Ref<FileReader> FileReaderRef;
+    typedef Ref<FileLoader> FileLoaderRef;
 }
 
 #endif
diff --git a/src/lib/src/FileReader.cc b/src/lib/src/FileLoader.cc
similarity index 93%
rename from src/lib/src/FileReader.cc
rename to src/lib/src/FileLoader.cc
index 75c72a1..ad55551 100644
--- a/src/lib/src/FileReader.cc
+++ b/src/lib/src/FileLoader.cc
@@ -1,5 +1,5 @@
 #include "jes.h"
-#include "jes/FileReader.h"
+#include "jes/FileLoader.h"
 #include "jes/Text.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -9,7 +9,7 @@
 
 namespace jes
 {
-    FileReader::FileReader()
+    FileLoader::FileLoader()
     {
         m_fd = 0;
         m_buf = NULL;
@@ -17,7 +17,7 @@ namespace jes
         m_lines = NULL;
     }
 
-    FileReader::~FileReader()
+    FileLoader::~FileLoader()
     {
         if (m_buf != NULL)
         {
@@ -26,7 +26,7 @@ namespace jes
         }
     }
 
-    bool FileReader::load(const char * fname)
+    bool FileLoader::load(const char * fname)
     {
         struct stat st;
         if (stat(fname, &st) != 0)
@@ -78,7 +78,7 @@ namespace jes
         return true;
     }
 
-    void FileReader::load_buf(size_t size)
+    void FileLoader::load_buf(size_t size)
     {
         LineIndexPairVectorRef lines[LINE_ENDING_COUNT];
         size_t line_start[LINE_ENDING_COUNT] = {0};
@@ -137,7 +137,7 @@ namespace jes
         }
     }
 
-    TextRef FileReader::get_line(unsigned int line_no)
+    TextRef FileLoader::get_line(unsigned int line_no)
     {
         return new Text((*m_lines)[line_no].first, (*m_lines)[line_no].second);
     }
diff --git a/test/src/test_FileReader.cc b/test/src/test_FileLoader.cc
similarity index 61%
rename from test/src/test_FileReader.cc
rename to test/src/test_FileLoader.cc
index 2348dc7..0a102eb 100644
--- a/test/src/test_FileReader.cc
+++ b/test/src/test_FileLoader.cc
@@ -1,52 +1,52 @@
 #include "gtest/gtest.h"
-#include "jes/FileReader.h"
+#include "jes/FileLoader.h"
 
 using namespace jes;
 
-TEST(FileReaderTest, num_lines_defaults_to_0)
+TEST(FileLoaderTest, num_lines_defaults_to_0)
 {
-    FileReader fr;
+    FileLoader fr;
     EXPECT_EQ(0, fr.num_lines());
 }
 
-TEST(FileReaderTest, load_returns_false_for_nonexistent_file)
+TEST(FileLoaderTest, load_returns_false_for_nonexistent_file)
 {
-    FileReader fr;
+    FileLoader fr;
     EXPECT_FALSE(fr.load("this/file/does/not/exist.txt"));
 }
 
-TEST(FileReaderTest, loading_empty_file)
+TEST(FileLoaderTest, loading_empty_file)
 {
-    FileReader fr;
+    FileLoader fr;
     EXPECT_TRUE(fr.load("test/files/empty.txt"));
     EXPECT_EQ(0, fr.num_lines());
 }
 
-TEST(FileReaderTest, reads_lf_format_file)
+TEST(FileLoaderTest, reads_lf_format_file)
 {
-    FileReader fr;
+    FileLoader fr;
     EXPECT_TRUE(fr.load("test/files/line_endings/unix_format.txt"));
-    EXPECT_EQ(FileReader::LINE_ENDING_LF, fr.get_line_endings());
+    EXPECT_EQ(FileLoader::LINE_ENDING_LF, fr.get_line_endings());
     EXPECT_EQ(2, fr.num_lines());
     EXPECT_EQ("Hello.", fr.get_line(0)->to_s());
     EXPECT_EQ("This file is in UNIX line ending format.", fr.get_line(1)->to_s());
 }
 
-TEST(FileReaderTest, reads_cr_format_file)
+TEST(FileLoaderTest, reads_cr_format_file)
 {
-    FileReader fr;
+    FileLoader fr;
     EXPECT_TRUE(fr.load("test/files/line_endings/mac_format.txt"));
-    EXPECT_EQ(FileReader::LINE_ENDING_CR, fr.get_line_endings());
+    EXPECT_EQ(FileLoader::LINE_ENDING_CR, fr.get_line_endings());
     EXPECT_EQ(2, fr.num_lines());
     EXPECT_EQ("Hello.", fr.get_line(0)->to_s());
     EXPECT_EQ("This file is in MAC line ending format.", fr.get_line(1)->to_s());
 }
 
-TEST(FileReaderTest, reads_crlf_format_file)
+TEST(FileLoaderTest, reads_crlf_format_file)
 {
-    FileReader fr;
+    FileLoader fr;
     EXPECT_TRUE(fr.load("test/files/line_endings/dos_format.txt"));
-    EXPECT_EQ(FileReader::LINE_ENDING_CRLF, fr.get_line_endings());
+    EXPECT_EQ(FileLoader::LINE_ENDING_CRLF, fr.get_line_endings());
     EXPECT_EQ(2, fr.num_lines());
     EXPECT_EQ("Hello.", fr.get_line(0)->to_s());
     EXPECT_EQ("This file is in DOS line ending format.", fr.get_line(1)->to_s());