diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt
index ab8e6dbd8..537a46357 100644
--- a/libs/CMakeLists.txt
+++ b/libs/CMakeLists.txt
@@ -8,5 +8,5 @@ add_subdirectory(libfabrickey)
 add_subdirectory(libfpgabitstream)
 add_subdirectory(libpcf)
 add_subdirectory(libbusgroup)
-add_subdirectory(libionamemap)
+add_subdirectory(libnamemanager)
 add_subdirectory(libtileconfig)
diff --git a/libs/libionamemap/CMakeLists.txt b/libs/libnamemanager/CMakeLists.txt
similarity index 72%
rename from libs/libionamemap/CMakeLists.txt
rename to libs/libnamemanager/CMakeLists.txt
index e99236d35..3a3420acc 100644
--- a/libs/libionamemap/CMakeLists.txt
+++ b/libs/libnamemanager/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.9)
 
-project("libionamemap")
+project("libnamemanager")
 
 file(GLOB_RECURSE EXEC_SOURCES test/*.cpp)
 file(GLOB_RECURSE LIB_SOURCES src/*/*.cpp)
@@ -11,14 +11,14 @@ files_to_dirs(LIB_HEADERS LIB_INCLUDE_DIRS)
 list(REMOVE_ITEM LIB_SOURCES ${EXEC_SOURCES})
 
 #Create the library
-add_library(libionamemap STATIC
+add_library(libnamemanager STATIC
             ${LIB_HEADERS}
             ${LIB_SOURCES})
-target_include_directories(libionamemap PUBLIC ${LIB_INCLUDE_DIRS})
-set_target_properties(libionamemap PROPERTIES PREFIX "") #Avoid extra 'lib' prefix
+target_include_directories(libnamemanager PUBLIC ${LIB_INCLUDE_DIRS})
+set_target_properties(libnamemanager PROPERTIES PREFIX "") #Avoid extra 'lib' prefix
 
 #Specify link-time dependancies
-target_link_libraries(libionamemap
+target_link_libraries(libnamemanager
                       libarchopenfpga
                       libopenfpgautil
                       libopenfpgashell
@@ -31,7 +31,7 @@ foreach(testsourcefile ${EXEC_SOURCES})
     get_filename_component(testname ${testsourcefile} NAME_WE)
     add_executable(${testname} ${testsourcefile})
     # Make sure the library is linked to each test executable
-    target_link_libraries(${testname} libionamemap)
+    target_link_libraries(${testname} libnamemanager)
 endforeach(testsourcefile ${EXEC_SOURCES})
 
-install(TARGETS libionamemap DESTINATION bin)
+install(TARGETS libnamemanager DESTINATION bin)
diff --git a/libs/libionamemap/example/example.xml b/libs/libnamemanager/example/example.xml
similarity index 100%
rename from libs/libionamemap/example/example.xml
rename to libs/libnamemanager/example/example.xml
diff --git a/libs/libionamemap/src/base/io_name_map.cpp b/libs/libnamemanager/src/base/io_name_map.cpp
similarity index 100%
rename from libs/libionamemap/src/base/io_name_map.cpp
rename to libs/libnamemanager/src/base/io_name_map.cpp
diff --git a/libs/libionamemap/src/base/io_name_map.h b/libs/libnamemanager/src/base/io_name_map.h
similarity index 100%
rename from libs/libionamemap/src/base/io_name_map.h
rename to libs/libnamemanager/src/base/io_name_map.h
diff --git a/libs/libionamemap/src/io/io_name_map_xml_constants.h b/libs/libnamemanager/src/io/io_name_map_xml_constants.h
similarity index 100%
rename from libs/libionamemap/src/io/io_name_map_xml_constants.h
rename to libs/libnamemanager/src/io/io_name_map_xml_constants.h
diff --git a/libs/libionamemap/src/io/read_xml_io_name_map.cpp b/libs/libnamemanager/src/io/read_xml_io_name_map.cpp
similarity index 100%
rename from libs/libionamemap/src/io/read_xml_io_name_map.cpp
rename to libs/libnamemanager/src/io/read_xml_io_name_map.cpp
diff --git a/libs/libionamemap/src/io/read_xml_io_name_map.h b/libs/libnamemanager/src/io/read_xml_io_name_map.h
similarity index 100%
rename from libs/libionamemap/src/io/read_xml_io_name_map.h
rename to libs/libnamemanager/src/io/read_xml_io_name_map.h
diff --git a/libs/libionamemap/src/io/write_xml_io_name_map.cpp b/libs/libnamemanager/src/io/write_xml_io_name_map.cpp
similarity index 100%
rename from libs/libionamemap/src/io/write_xml_io_name_map.cpp
rename to libs/libnamemanager/src/io/write_xml_io_name_map.cpp
diff --git a/libs/libionamemap/src/io/write_xml_io_name_map.h b/libs/libnamemanager/src/io/write_xml_io_name_map.h
similarity index 100%
rename from libs/libionamemap/src/io/write_xml_io_name_map.h
rename to libs/libnamemanager/src/io/write_xml_io_name_map.h
diff --git a/libs/libionamemap/test/xml_io_io_name_map.cpp b/libs/libnamemanager/test/xml_io_io_name_map.cpp
similarity index 100%
rename from libs/libionamemap/test/xml_io_io_name_map.cpp
rename to libs/libnamemanager/test/xml_io_io_name_map.cpp
diff --git a/openfpga/CMakeLists.txt b/openfpga/CMakeLists.txt
index bea2fa94d..96c450876 100644
--- a/openfpga/CMakeLists.txt
+++ b/openfpga/CMakeLists.txt
@@ -41,7 +41,7 @@ target_link_libraries(libopenfpga
                       libpcf
                       libvtrutil
                       libbusgroup
-                      libionamemap
+                      libnamemanager
                       libtileconfig
                       libpugixml
                       libvpr)