diff --git a/hueplusplus/test/mocks/mock_BaseHttpHandler.h b/hueplusplus/test/mocks/mock_BaseHttpHandler.h
index 132a6d3..85d19bf 100644
--- a/hueplusplus/test/mocks/mock_BaseHttpHandler.h
+++ b/hueplusplus/test/mocks/mock_BaseHttpHandler.h
@@ -1,5 +1,5 @@
 /**
-	\file mock_LinHttpHandler.h
+	\file mock_BaseHttpHandler.h
 	Copyright Notice\n
 	Copyright (C) 2017  Jan Rogall		- developer\n
 	Copyright (C) 2017  Moritz Wirger	- developer\n
@@ -17,8 +17,8 @@
 	Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 **/
 
-#ifndef _MOCK_LIN_HTTPHANDLER_H
-#define _MOCK_LIN_HTTPHANDLER_H
+#ifndef _MOCK_BASE_HTTPHANDLER_H
+#define _MOCK_BASE_HTTPHANDLER_H
 
 #include <string>
 #include <vector>
diff --git a/hueplusplus/test/test_BaseHttpHandler.cpp b/hueplusplus/test/test_BaseHttpHandler.cpp
index e2660b1..4b3779f 100755
--- a/hueplusplus/test/test_BaseHttpHandler.cpp
+++ b/hueplusplus/test/test_BaseHttpHandler.cpp
@@ -2,7 +2,7 @@
 #include <gmock/gmock.h>
 
 #include "../include/json/json.h"
-#include "mocks/mock_LinHttpHandler.h"
+#include "mocks/mock_BaseHttpHandler.h"
 #include "testhelper.h"
 
 #include <memory>
@@ -11,7 +11,7 @@
 TEST(BaseHttpHandler, sendGetHTTPBody)
 {
     using namespace ::testing;
-    MockLinHttpHandler handler;
+	MockBaseHttpHandler handler;
 
     EXPECT_CALL(handler, send("testmsg", "192.168.2.1", 90))
         .Times(AtLeast(2))
@@ -25,7 +25,7 @@ TEST(BaseHttpHandler, sendGetHTTPBody)
 TEST(BaseHttpHandler, sendHTTPRequest)
 {
     using namespace ::testing;
-    MockLinHttpHandler handler;
+	MockBaseHttpHandler handler;
 
     EXPECT_CALL(handler, send("GET UrI HTTP/1.0\r\nContent-Type: text/html\r\nContent-Length: 4\r\n\r\nbody\r\n\r\n", "192.168.2.1", 90))
         .Times(AtLeast(2))
@@ -39,7 +39,7 @@ TEST(BaseHttpHandler, sendHTTPRequest)
 TEST(BaseHttpHandler, GETString)
 {
     using namespace ::testing;
-    MockLinHttpHandler handler;
+	MockBaseHttpHandler handler;
 
     EXPECT_CALL(handler, send("GET UrI HTTP/1.0\r\nContent-Type: text/html\r\nContent-Length: 4\r\n\r\nbody\r\n\r\n", "192.168.2.1", 90))
         .Times(AtLeast(2))
@@ -53,7 +53,7 @@ TEST(BaseHttpHandler, GETString)
 TEST(BaseHttpHandler, POSTString)
 {
     using namespace ::testing;
-    MockLinHttpHandler handler;
+	MockBaseHttpHandler handler;
 
     EXPECT_CALL(handler, send("POST UrI HTTP/1.0\r\nContent-Type: text/html\r\nContent-Length: 4\r\n\r\nbody\r\n\r\n", "192.168.2.1", 90))
         .Times(AtLeast(2))
@@ -67,7 +67,7 @@ TEST(BaseHttpHandler, POSTString)
 TEST(BaseHttpHandler, PUTString)
 {
     using namespace ::testing;
-    MockLinHttpHandler handler;
+	MockBaseHttpHandler handler;
 
     EXPECT_CALL(handler, send("PUT UrI HTTP/1.0\r\nContent-Type: text/html\r\nContent-Length: 4\r\n\r\nbody\r\n\r\n", "192.168.2.1", 90))
         .Times(AtLeast(2))
@@ -81,7 +81,7 @@ TEST(BaseHttpHandler, PUTString)
 TEST(BaseHttpHandler, DELETEString)
 {
     using namespace ::testing;
-    MockLinHttpHandler handler;
+	MockBaseHttpHandler handler;
 
     EXPECT_CALL(handler, send("DELETE UrI HTTP/1.0\r\nContent-Type: text/html\r\nContent-Length: 4\r\n\r\nbody\r\n\r\n", "192.168.2.1", 90))
         .Times(AtLeast(2))
@@ -95,7 +95,7 @@ TEST(BaseHttpHandler, DELETEString)
 TEST(BaseHttpHandler, GETJson)
 {
     using namespace ::testing;
-    MockLinHttpHandler handler;
+	MockBaseHttpHandler handler;
 
     Json::Value testval;
     testval["test"] = 100;
@@ -121,7 +121,7 @@ TEST(BaseHttpHandler, GETJson)
 TEST(BaseHttpHandler, POSTJson)
 {
     using namespace ::testing;
-    MockLinHttpHandler handler;
+	MockBaseHttpHandler handler;
 
     Json::Value testval;
     testval["test"] = 100;
@@ -147,7 +147,7 @@ TEST(BaseHttpHandler, POSTJson)
 TEST(BaseHttpHandler, PUTJson)
 {
     using namespace ::testing;
-    MockLinHttpHandler handler;
+	MockBaseHttpHandler handler;
 
     Json::Value testval;
     testval["test"] = 100;
@@ -173,7 +173,7 @@ TEST(BaseHttpHandler, PUTJson)
 TEST(BaseHttpHandler, DELETEJson)
 {
     using namespace ::testing;
-    MockLinHttpHandler handler;
+	MockBaseHttpHandler handler;
 
     Json::Value testval;
     testval["test"] = 100;