diff --git a/test/Makefile b/test/Makefile
index 04a136c..f9f2fb3 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -22,18 +22,18 @@ OBJ_FRAMEWORK=$(subst .cc,.o,$(SRC_FRAMEWORK))
 #    -include $(DEPENDS)
 #endif
 
-.PHONY: all clean rmtestdata peptest peptest_clean
+.PHONY: all clean rmtestdata pitytest pitytest_clean
 .DEFAULT_GOAL := all
 
-all: $(BIN_TEST) peptest
+all: $(BIN_TEST) pitytest
 
 $(BIN_TEST): $(OBJ_FRAMEWORK)
 
-peptest:
-	$(MAKE) -C pEpTest
+pitytest:
+	$(MAKE) -C pitytest11
 
 
-clean: peptest_clean
+clean: pitytest_clean
 	rm -f $(BIN_TEST)
 	rm -f $(OBJ_FRAMEWORK)
 	rm -Rf *.dSYM
@@ -41,8 +41,8 @@ clean: peptest_clean
 	rm -f *.o
 	rm -Rf /tmp/test_pEp.*
 
-peptest_clean:
-	$(MAKE) -C pEpTest clean
+pitytest_clean:
+	$(MAKE) -C pitytest11 clean
 
 rmtestdata:
 	rm -Rf /tmp/test_pEp.*
diff --git a/test/PityTest11/Makefile b/test/pitytest11/Makefile
similarity index 100%
rename from test/PityTest11/Makefile
rename to test/pitytest11/Makefile
diff --git a/test/PityTest11/src/PityModel.cc b/test/pitytest11/src/PityModel.cc
similarity index 100%
rename from test/PityTest11/src/PityModel.cc
rename to test/pitytest11/src/PityModel.cc
diff --git a/test/PityTest11/src/PityModel.hh b/test/pitytest11/src/PityModel.hh
similarity index 73%
rename from test/PityTest11/src/PityModel.hh
rename to test/pitytest11/src/PityModel.hh
index 720a6ce..a660a26 100644
--- a/test/PityTest11/src/PityModel.hh
+++ b/test/pitytest11/src/PityModel.hh
@@ -1,8 +1,8 @@
 // This file is under GNU General Public License 3.0
 // see LICENSE.txt
 
-#ifndef LIBPEPADAPTER_PEPTESTMODEL_HH
-#define LIBPEPADAPTER_PEPTESTMODEL_HH
+#ifndef PITYTEST_PITYMODEL_HH
+#define PITYTEST_PITYMODEL_HH
 
 #include "../../../src/pEpLog.hh"
 
@@ -17,10 +17,10 @@ namespace pEp {
         private:
             const std::string name;
             static bool log_enabled;
-            Adapter::pEpLog::pEpLogger logger{ "pEpTestModel", log_enabled };
+            Adapter::pEpLog::pEpLogger logger{ "PityModel", log_enabled };
             Adapter::pEpLog::pEpLogger& m4gic_logger_n4me = logger;
         };
     }; // namespace Test
 };     // namespace pEp
 
-#endif // LIBPEPADAPTER_PEPTESTMODEL_HH
+#endif // PITYTEST_PITYMODEL_HH
diff --git a/test/PityTest11/src/PityUnit.hh b/test/pitytest11/src/PityUnit.hh
similarity index 97%
rename from test/PityTest11/src/PityUnit.hh
rename to test/pitytest11/src/PityUnit.hh
index e4f2397..580f10d 100644
--- a/test/PityTest11/src/PityUnit.hh
+++ b/test/pitytest11/src/PityUnit.hh
@@ -61,7 +61,7 @@ namespace pEp {
 
             // internal logging
             static bool debug_log_enabled;
-            Adapter::pEpLog::pEpLogger logger_debug{ "pEpTestTree", debug_log_enabled };
+            Adapter::pEpLog::pEpLogger logger_debug{ "PityUnit", debug_log_enabled };
 
         private:
             // CONSTRUCTORS
diff --git a/test/PityTest11/src/PityUnit.hxx b/test/pitytest11/src/PityUnit.hxx
similarity index 98%
rename from test/PityTest11/src/PityUnit.hxx
rename to test/pitytest11/src/PityUnit.hxx
index cbae9e6..6911dd8 100644
--- a/test/PityTest11/src/PityUnit.hxx
+++ b/test/pitytest11/src/PityUnit.hxx
@@ -1,8 +1,8 @@
 // This file is under GNU General Public License 3.0
 // see LICENSE.txt
 
-#ifndef LIBPEPADAPTER_PEPTEST_PityUnit_HXX
-#define LIBPEPADAPTER_PEPTEST_PityUnit_HXX
+#ifndef PITYTEST_PITYUNIT_HXX
+#define PITYTEST_PITYUNIT_HXX
 
 #include "../../../src/std_utils.hh"
 #include "../../framework/utils.hh"
@@ -20,7 +20,7 @@ using namespace pEp::Adapter::pEpLog;
 namespace pEp {
     namespace PityTest11 {
         template<class T>
-        std::string PityUnit<T>::_global_root_dir = "./peptest";
+        std::string PityUnit<T>::_global_root_dir = "./pitytest";
         template<class T>
         bool PityUnit<T>::debug_log_enabled = false;
 
@@ -387,4 +387,4 @@ namespace pEp {
     } // namespace Test
 } // namespace pEp
 
-#endif // LIBPEPADAPTER_PEPTEST_PityUnit_HXX
\ No newline at end of file
+#endif // PITYTEST_PITYUNIT_HXX
\ No newline at end of file
diff --git a/test/PityTest11/test/test_execmodes.cc b/test/pitytest11/test/test_execmodes.cc
similarity index 98%
rename from test/PityTest11/test/test_execmodes.cc
rename to test/pitytest11/test/test_execmodes.cc
index ab063de..393c358 100644
--- a/test/PityTest11/test/test_execmodes.cc
+++ b/test/pitytest11/test/test_execmodes.cc
@@ -17,7 +17,7 @@ void printHomeDir(const PityUnit<>& myself, int sleepmilis, int rep_count)
 int main(int argc, char* argv[])
 {
     {
-        // DEBUG Logging of pEpTestTree itself
+        // DEBUG Logging of PityTestUnit itself
         PityUnit<>::debug_log_enabled = false;
 
         // Configure DataRoot for all TestNodes
diff --git a/test/PityTest11/test/test_processdirs.cc b/test/pitytest11/test/test_processdirs.cc
similarity index 96%
rename from test/PityTest11/test/test_processdirs.cc
rename to test/pitytest11/test/test_processdirs.cc
index 2abade1..f1f35ee 100644
--- a/test/PityTest11/test/test_processdirs.cc
+++ b/test/pitytest11/test/test_processdirs.cc
@@ -14,6 +14,11 @@ void printHomeDir(const PityUnit<>& myself)
     myself.log("HOME=" + string(getenv("HOME")));
 }
 
+void ptAssert(bool condition) {
+    if(!condition) {
+
+    }
+}
 
 int main(int argc, char* argv[])
 {