diff --git a/tests/blackgui/main.cpp b/tests/blackgui/main.cpp
index 8e41b7eb6..3c3cd6193 100644
--- a/tests/blackgui/main.cpp
+++ b/tests/blackgui/main.cpp
@@ -19,7 +19,7 @@
 #include <QCoreApplication>
 #include <QtGlobal>
 
-using namespace BlackCoreTest;
+using namespace BlackGuiTest;
 
 //! Starter for test cases
 int main(int argc, char *argv[])
diff --git a/tests/blackgui/testblackguimain.cpp b/tests/blackgui/testblackguimain.cpp
index fcbad97df..0f54ce596 100644
--- a/tests/blackgui/testblackguimain.cpp
+++ b/tests/blackgui/testblackguimain.cpp
@@ -19,7 +19,7 @@
 
 #include <QtTest>
 
-namespace BlackCoreTest
+namespace BlackGuiTest
 {
     /*
      * Starting main, equivalent to QTEST_APPLESS_MAIN for multiple test classes.
diff --git a/tests/blackgui/testblackguimain.h b/tests/blackgui/testblackguimain.h
index b3a4ff12e..9bededcfc 100644
--- a/tests/blackgui/testblackguimain.h
+++ b/tests/blackgui/testblackguimain.h
@@ -14,10 +14,10 @@
  * \ingroup testblackgui
  */
 
-#ifndef BLACKCORETEST_TESTMAIN_H
-#define BLACKCORETEST_TESTMAIN_H
+#ifndef BLACKGUITEST_TESTMAIN_H
+#define BLACKGUITEST_TESTMAIN_H
 
-namespace BlackCoreTest
+namespace BlackGuiTest
 {
 
     /*!
diff --git a/tests/blackgui/testutils.cpp b/tests/blackgui/testutils.cpp
index 24de4ec1b..28c00e91b 100644
--- a/tests/blackgui/testutils.cpp
+++ b/tests/blackgui/testutils.cpp
@@ -21,7 +21,7 @@
 
 using namespace BlackGui;
 
-namespace BlackCoreTest
+namespace BlackGuiTest
 {
 
     CTestGuiUtilities::CTestGuiUtilities(QObject *parent) :
diff --git a/tests/blackgui/testutils.h b/tests/blackgui/testutils.h
index 1919b8cf7..3cff28691 100644
--- a/tests/blackgui/testutils.h
+++ b/tests/blackgui/testutils.h
@@ -14,12 +14,12 @@
  * \ingroup testblackgui
  */
 
-#ifndef BLACKCORETEST_TESTUTILS_H
-#define BLACKCORETEST_TESTUTILS_H
+#ifndef BLACKGUITEST_TESTUTILS_H
+#define BLACKGUITEST_TESTUTILS_H
 
 #include <QObject>
 
-namespace BlackCoreTest
+namespace BlackGuiTest
 {
     /**
      * Test GUI utilities