diff --git a/src/ArduinoHttpClient.h b/src/ArduinoHttpClient.h
index abb8494..2584731 100644
--- a/src/ArduinoHttpClient.h
+++ b/src/ArduinoHttpClient.h
@@ -5,7 +5,7 @@
 #ifndef ArduinoHttpClient_h
 #define ArduinoHttpClient_h
 
-#include "HttpClient.h"
+#include "Http_Client.h"
 #include "WebSocketClient.h"
 #include "URLEncoder.h"
 
diff --git a/src/HttpClient.cpp b/src/Http_Client.cpp
similarity index 99%
rename from src/HttpClient.cpp
rename to src/Http_Client.cpp
index 1c73464..79defb4 100644
--- a/src/HttpClient.cpp
+++ b/src/Http_Client.cpp
@@ -2,7 +2,7 @@
 // (c) Copyright 2010-2011 MCQN Ltd
 // Released under Apache License, version 2.0
 
-#include "HttpClient.h"
+#include "Http_Client.h"
 #include "b64.h"
 
 // Initialize constants
diff --git a/src/HttpClient.h b/src/Http_Client.h
similarity index 99%
rename from src/HttpClient.h
rename to src/Http_Client.h
index 6a7aa1d..8d43c5b 100644
--- a/src/HttpClient.h
+++ b/src/Http_Client.h
@@ -2,8 +2,8 @@
 // (c) Copyright MCQN Ltd. 2010-2012
 // Released under Apache License, version 2.0
 
-#ifndef HttpClient_h
-#define HttpClient_h
+#ifndef Http_Client_h
+#define Http_Client_h
 
 #include <Arduino.h>
 #include <IPAddress.h>
diff --git a/src/WebSocketClient.h b/src/WebSocketClient.h
index 4b009e6..7d026b9 100644
--- a/src/WebSocketClient.h
+++ b/src/WebSocketClient.h
@@ -6,7 +6,7 @@
 
 #include <Arduino.h>
 
-#include "HttpClient.h"
+#include "Http_Client.h"
 
 static const int TYPE_CONTINUATION     = 0x0;
 static const int TYPE_TEXT             = 0x1;