diff --git a/include/cclause.h b/include/cclause.h
index 2a5c04c..f43c31c 100644
--- a/include/cclause.h
+++ b/include/cclause.h
@@ -7,7 +7,7 @@
 #include <vector>
 class Clauses;
 
-using namespace Glucose;
+using namespace NSPACE;
 
 /**
  * @brief      Class for  representing a clause.
diff --git a/include/clauses.h b/include/clauses.h
index 1bcaee3..8751cfe 100644
--- a/include/clauses.h
+++ b/include/clauses.h
@@ -7,7 +7,7 @@
 #include "time_tabler.h"
 #include <vector>
 
-using namespace Glucose;
+using namespace NSPACE;
 
 class CClause;
 
diff --git a/include/constraint_adder.h b/include/constraint_adder.h
index b23b8b9..5f4422c 100644
--- a/include/constraint_adder.h
+++ b/include/constraint_adder.h
@@ -9,7 +9,7 @@
 #include "global.h"
 class TimeTabler;
 
-using namespace Glucose;
+using namespace NSPACE;
 
 /**
  * @brief      Class for constraint adder.
diff --git a/include/constraint_encoder.h b/include/constraint_encoder.h
index f8bdd71..4d9c5b9 100644
--- a/include/constraint_encoder.h
+++ b/include/constraint_encoder.h
@@ -9,7 +9,7 @@
 #include "time_tabler.h"
 #include <vector>
 
-using namespace Glucose;
+using namespace NSPACE;
 
 /**
  * @brief      Class for constraint encoder.
diff --git a/include/data.h b/include/data.h
index ff404ee..872191c 100644
--- a/include/data.h
+++ b/include/data.h
@@ -13,7 +13,7 @@
 #include <string>
 #include <vector>
 
-using namespace Glucose;
+using namespace NSPACE;
 
 /**
  * @brief      Class for data.
diff --git a/include/time_tabler.h b/include/time_tabler.h
index 36883b8..0965c73 100644
--- a/include/time_tabler.h
+++ b/include/time_tabler.h
@@ -11,7 +11,7 @@
 #include "tsolver.h"
 #include <vector>
 
-using namespace Glucose;
+using namespace NSPACE;
 
 /**
  * @brief      Enum to store the solver status
diff --git a/include/tsolver.h b/include/tsolver.h
index 97341f8..50a9e3b 100644
--- a/include/tsolver.h
+++ b/include/tsolver.h
@@ -8,7 +8,7 @@
 #include "mtl/Vec.h"
 #include <vector>
 
-using namespace Glucose;
+using namespace NSPACE;
 using namespace openwbo;
 
 /**
diff --git a/include/utils.h b/include/utils.h
index c4d101a..dae7617 100644
--- a/include/utils.h
+++ b/include/utils.h
@@ -9,12 +9,12 @@
 #include <string>
 #include <vector>
 
-using namespace Glucose;
+using namespace NSPACE;
 
 namespace Utils {
 
 /**
- * @brief      Converts a std::vector to a Glucose::vec.
+ * @brief      Converts a std::vector to a NSPACE::vec.
  *
  * @param[in]  inputs  The input vector
  *
@@ -31,7 +31,7 @@ template <typename T> vec<T> convertVectorToVec(std::vector<T> inputs) {
 }
 
 /**
- * @brief      Converts a Glucose::vec to a std::vector.
+ * @brief      Converts a NSPACE::vec to a std::vector.
  *
  * @param[in]  inputs  The input vec
  *
@@ -48,7 +48,7 @@ template <typename T> std::vector<T> convertVecToVector(vec<T> inputs) {
 }
 
 /**
- * @brief      Converts given data and size, a Glucose::vec to a std::vector.
+ * @brief      Converts given data and size, a NSPACE::vec to a std::vector.
  *
  * @param      data  The data pointer
  * @param[in]  size  The size
diff --git a/src/cclause.cpp b/src/cclause.cpp
index b70156a..f34cf4f 100644
--- a/src/cclause.cpp
+++ b/src/cclause.cpp
@@ -5,7 +5,7 @@
 #include <iostream>
 #include <vector>
 
-using namespace Glucose;
+using namespace NSPACE;
 
 /**
  * @brief      Constructs the CClause object.
diff --git a/src/clauses.cpp b/src/clauses.cpp
index 0dc21b0..d365763 100644
--- a/src/clauses.cpp
+++ b/src/clauses.cpp
@@ -6,7 +6,7 @@
 #include <iostream>
 #include <vector>
 
-using namespace Glucose;
+using namespace NSPACE;
 
 /**
  * @brief      Constructs the Clauses object.
diff --git a/src/constraint_adder.cpp b/src/constraint_adder.cpp
index a27edbb..a877f4a 100644
--- a/src/constraint_adder.cpp
+++ b/src/constraint_adder.cpp
@@ -9,7 +9,7 @@
 #include <iostream>
 #include <vector>
 
-using namespace Glucose;
+using namespace NSPACE;
 
 /**
  * @brief      Constructs the ConstraintAdder object.
diff --git a/src/constraint_encoder.cpp b/src/constraint_encoder.cpp
index f618ecf..35ce85a 100644
--- a/src/constraint_encoder.cpp
+++ b/src/constraint_encoder.cpp
@@ -9,7 +9,7 @@
 #include <iostream>
 #include <vector>
 
-using namespace Glucose;
+using namespace NSPACE;
 
 /**
  * @brief      Constructs the ConstraintEncoder object.
diff --git a/src/time_tabler.cpp b/src/time_tabler.cpp
index 5325db7..d5ec7d4 100644
--- a/src/time_tabler.cpp
+++ b/src/time_tabler.cpp
@@ -12,7 +12,7 @@
 #include <iostream>
 #include <vector>
 
-using namespace Glucose;
+using namespace NSPACE;
 
 /**
  * @brief      Constructs the TimeTabler object.
diff --git a/src/tsolver.cpp b/src/tsolver.cpp
index 5a4d445..943efde 100644
--- a/src/tsolver.cpp
+++ b/src/tsolver.cpp
@@ -36,7 +36,7 @@
 #include "mtl/Vec.h"
 #include "utils.h"
 
-using namespace Glucose;
+using namespace NSPACE;
 using namespace openwbo;
 
 /**