diff --git a/CMakeLists.txt b/CMakeLists.txt
index 220eaf48888f486a693a77ab8b14d1007b30c170..560dd74c04bf5f76dee000a9a8883276ff99bdfd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -597,7 +597,7 @@ target_link_libraries(
   PugsMesh
   PugsAlgebra
   PugsAnalysis
-  PugsDevUtils
+  PugsDev
   PugsUtils
   PugsLanguage
   PugsLanguageAST
@@ -635,7 +635,7 @@ install(TARGETS
   PugsMesh
   PugsAlgebra
   PugsAnalysis
-  PugsDevUtils
+  PugsDev
   PugsUtils
   PugsLanguage
   PugsLanguageAST
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1e642e86ae612db7f3208e8ea066194496a2bfbe..eebccac12c3c1c7b80b6b1e13ff81d0e802a8def 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,8 +6,8 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 # Pugs utils
 add_subdirectory(utils)
 
-# Pugs dev_utils
-add_subdirectory(dev_utils)
+# Pugs dev
+add_subdirectory(dev)
 
 # Pugs language
 add_subdirectory(language)
diff --git a/src/dev_utils/CMakeLists.txt b/src/dev/CMakeLists.txt
similarity index 82%
rename from src/dev_utils/CMakeLists.txt
rename to src/dev/CMakeLists.txt
index c603f0d1da3c87fe0986c4f705207acd7c300907..22264f7ed13afbef5569fd42c764c56f67ca9e23 100644
--- a/src/dev_utils/CMakeLists.txt
+++ b/src/dev/CMakeLists.txt
@@ -1,11 +1,11 @@
 # ------------------- Source files --------------------
 
 add_library(
-  PugsDevUtils
+  PugsDev
   ParallelChecker.cpp
 )
 
 target_link_libraries(
-  PugsDevUtils
+  PugsDev
   ${HIGHFIVE_TARGET}
 )
diff --git a/src/dev_utils/ParallelChecker.cpp b/src/dev/ParallelChecker.cpp
similarity index 96%
rename from src/dev_utils/ParallelChecker.cpp
rename to src/dev/ParallelChecker.cpp
index 104d30c14392b6c3700fea359f779e8f94ffd8bd..680cd92e61370b065c3fdf4c318da18648f35dbc 100644
--- a/src/dev_utils/ParallelChecker.cpp
+++ b/src/dev/ParallelChecker.cpp
@@ -1,4 +1,4 @@
-#include <dev_utils/ParallelChecker.hpp>
+#include <dev/ParallelChecker.hpp>
 
 ParallelChecker* ParallelChecker::m_instance = nullptr;
 
diff --git a/src/dev_utils/ParallelChecker.hpp b/src/dev/ParallelChecker.hpp
similarity index 100%
rename from src/dev_utils/ParallelChecker.hpp
rename to src/dev/ParallelChecker.hpp
diff --git a/src/language/modules/DevUtilsModule.cpp b/src/language/modules/DevUtilsModule.cpp
index 3d8ae43d705d3fdbbcd94748373635a29252883c..1de94fa63ed37306f31c175a7c112ade69e6191e 100644
--- a/src/language/modules/DevUtilsModule.cpp
+++ b/src/language/modules/DevUtilsModule.cpp
@@ -1,6 +1,6 @@
 #include <language/modules/DevUtilsModule.hpp>
 
-#include <dev_utils/ParallelChecker.hpp>
+#include <dev/ParallelChecker.hpp>
 #include <language/utils/ASTDotPrinter.hpp>
 #include <language/utils/ASTExecutionInfo.hpp>
 #include <language/utils/ASTPrinter.hpp>
diff --git a/src/main.cpp b/src/main.cpp
index c251c067301b93000f15b2f9502537483d09b66d..7ee38e518aba13655318300e2ac53442ad4e8f49 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,5 +1,5 @@
 #include <analysis/QuadratureManager.hpp>
-#include <dev_utils/ParallelChecker.hpp>
+#include <dev/ParallelChecker.hpp>
 #include <language/PugsParser.hpp>
 #include <mesh/DualConnectivityManager.hpp>
 #include <mesh/DualMeshManager.hpp>
diff --git a/src/utils/PugsUtils.cpp b/src/utils/PugsUtils.cpp
index 2919ff18866dce74847bf672b61f0200f6a77dc6..54bec14a0b1c48c318cd310b914ce8b750c62f31 100644
--- a/src/utils/PugsUtils.cpp
+++ b/src/utils/PugsUtils.cpp
@@ -1,6 +1,6 @@
 #include <utils/PugsUtils.hpp>
 
-#include <dev_utils/ParallelChecker.hpp>
+#include <dev/ParallelChecker.hpp>
 #include <utils/BacktraceManager.hpp>
 #include <utils/BuildInfo.hpp>
 #include <utils/CommunicatorManager.hpp>
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 04a7ae9e9a8014d59f3b2f7880cc044ed3cf9355..fa8fabd7fd5a4cf7479760d91cdc851f79f641ba 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -225,7 +225,7 @@ target_link_libraries (unit_tests
   PugsScheme
   PugsOutput
   PugsUtils
-  PugsDevUtils
+  PugsDev
   Kokkos::kokkos
   ${PARMETIS_LIBRARIES}
   ${MPI_CXX_LINK_FLAGS} ${MPI_CXX_LIBRARIES}
@@ -251,7 +251,7 @@ target_link_libraries (mpi_unit_tests
   PugsLanguageUtils
   PugsScheme
   PugsOutput
-  PugsDevUtils
+  PugsDev
   PugsUtils
   PugsAlgebra
   PugsMesh