diff --git a/CMakeLists.txt b/CMakeLists.txt
index 84eccb39..7748dc4f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,8 +1,8 @@
-# xo-parser/CMakeLists.txt
+# xo-reader/CMakeLists.txt
 
 cmake_minimum_required(VERSION 3.10)
 
-project(xo_parser VERSION 0.1)
+project(xo_reader VERSION 0.1)
 
 include(GNUInstallDirs)
 include(cmake/xo-bootstrap-macros.cmake)
@@ -18,7 +18,7 @@ add_definitions(${PROJECT_CXX_FLAGS})
 
 # ----------------------------------------------------------------
 
-add_subdirectory(src/parser)
+add_subdirectory(src/reader)
 add_subdirectory(utest)
 
 # ----------------------------------------------------------------
diff --git a/cmake/xo_parserConfig.cmake.in b/cmake/xo_readerConfig.cmake.in
similarity index 100%
rename from cmake/xo_parserConfig.cmake.in
rename to cmake/xo_readerConfig.cmake.in
diff --git a/include/xo/parser/parser.hpp b/include/xo/reader/parser.hpp
similarity index 100%
rename from include/xo/parser/parser.hpp
rename to include/xo/reader/parser.hpp
diff --git a/include/xo/parser/reader.hpp b/include/xo/reader/reader.hpp
similarity index 100%
rename from include/xo/parser/reader.hpp
rename to include/xo/reader/reader.hpp
diff --git a/src/parser/CMakeLists.txt b/src/reader/CMakeLists.txt
similarity index 91%
rename from src/parser/CMakeLists.txt
rename to src/reader/CMakeLists.txt
index a97b50fa..687ae4e1 100644
--- a/src/parser/CMakeLists.txt
+++ b/src/reader/CMakeLists.txt
@@ -1,6 +1,6 @@
 # parser/CMakeLists.txt
 
-set(SELF_LIB xo_parser)
+set(SELF_LIB xo_reader)
 set(SELF_SRCS
     parser.cpp
     reader.cpp)
diff --git a/src/parser/parser.cpp b/src/reader/parser.cpp
similarity index 100%
rename from src/parser/parser.cpp
rename to src/reader/parser.cpp
diff --git a/src/parser/reader.cpp b/src/reader/reader.cpp
similarity index 100%
rename from src/parser/reader.cpp
rename to src/reader/reader.cpp
diff --git a/utest/CMakeLists.txt b/utest/CMakeLists.txt
index d70b7d4d..d1e00b46 100644
--- a/utest/CMakeLists.txt
+++ b/utest/CMakeLists.txt
@@ -1,13 +1,13 @@
-# xo-parser/utest/CMakeLists.txt
+# xo-reader/utest/CMakeLists.txt
 
 set(UTEST_EXE utest.parser)
 set(UTEST_SRCS
-    parser_utest_main.cpp
+    reader_utest_main.cpp
     parser.test.cpp)
 
 if (ENABLE_TESTING)
     xo_add_utest_executable(${UTEST_EXE} ${UTEST_SRCS})
-    xo_self_dependency(${UTEST_EXE} xo_parser)
+    xo_self_dependency(${UTEST_EXE} xo_reader)
     #xo_dependency(${UTEST_EXE} xo_ratio)
     #xo_dependency(${UTEST_EXE} xo_reflectutil)
     xo_external_target_dependency(${UTEST_EXE} Catch2 Catch2::Catch2)
diff --git a/utest/parser.test.cpp b/utest/parser.test.cpp
index 8397f903..aa230c7a 100644
--- a/utest/parser.test.cpp
+++ b/utest/parser.test.cpp
@@ -3,7 +3,7 @@
  * author: Roland Conybeare
  */
 
-#include "xo/parser/parser.hpp"
+#include "xo/reader/parser.hpp"
 #include <catch2/catch.hpp>
 
 namespace xo {
diff --git a/utest/parser_utest_main.cpp b/utest/reader_utest_main.cpp
similarity index 100%
rename from utest/parser_utest_main.cpp
rename to utest/reader_utest_main.cpp