6 files changed, 6 insertions, 11 deletions
diff --git a/apps/http-proxy/CMakeLists.txt b/apps/http-proxy/CMakeLists.txt
index d3155a0d4..d2d02d0dc 100644
--- a/apps/http-proxy/CMakeLists.txt
+++ b/apps/http-proxy/CMakeLists.txt
@@ -27,7 +27,7 @@ endif ()
 set(LIB_SOURCE_FILES
   src/http_session.cc
   src/http_proxy.cc
-  src/HTTP1.xMessageFastParser.cc
+  src/http_1x_message_fast_parser.cc
   src/icn_receiver.cc
   src/forwarder_interface.cc
 )
diff --git a/apps/http-proxy/includes/hicn/http-proxy/CMakeLists.txt b/apps/http-proxy/includes/hicn/http-proxy/CMakeLists.txt
index 5bc7d45fc..75cbbd64b 100644
--- a/apps/http-proxy/includes/hicn/http-proxy/CMakeLists.txt
+++ b/apps/http-proxy/includes/hicn/http-proxy/CMakeLists.txt
@@ -18,7 +18,7 @@ list(APPEND HEADER_FILES
   ${CMAKE_CURRENT_SOURCE_DIR}/forwarder_interface.h
   ${CMAKE_CURRENT_SOURCE_DIR}/http_proxy.h
   ${CMAKE_CURRENT_SOURCE_DIR}/http_session.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/HTTP1.xMessageFastParser.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/http_1x_message_fast_parser.h
   ${CMAKE_CURRENT_SOURCE_DIR}/icn_receiver.h
   ${CMAKE_CURRENT_SOURCE_DIR}/utils.h
 )
diff --git a/apps/http-proxy/includes/hicn/http-proxy/HTTP1.xMessageFastParser.h b/apps/http-proxy/includes/hicn/http-proxy/http_1x_message_fast_parser.h
index 7c035c83b..7c035c83b 100644
--- a/apps/http-proxy/includes/hicn/http-proxy/HTTP1.xMessageFastParser.h
+++ b/apps/http-proxy/includes/hicn/http-proxy/http_1x_message_fast_parser.h
diff --git a/apps/http-proxy/includes/hicn/http-proxy/http_session.h b/apps/http-proxy/includes/hicn/http-proxy/http_session.h
index 05fdf62fa..f4a3dbdee 100644
--- a/apps/http-proxy/includes/hicn/http-proxy/http_session.h
+++ b/apps/http-proxy/includes/hicn/http-proxy/http_session.h
@@ -17,7 +17,7 @@
 
 #include <hicn/transport/core/packet.h>
 
-#include "HTTP1.xMessageFastParser.h"
+#include "http_1x_message_fast_parser.h"
 
 #define ASIO_STANDALONE
 #include <asio.hpp>
diff --git a/apps/http-proxy/src/HTTP1.xMessageFastParser.cc b/apps/http-proxy/src/http_1x_message_fast_parser.cc
index c22abdc90..4b6b78d55 100644
--- a/apps/http-proxy/src/HTTP1.xMessageFastParser.cc
+++ b/apps/http-proxy/src/http_1x_message_fast_parser.cc
@@ -13,8 +13,7 @@
  * limitations under the License.
  */
 
-#include <hicn/http-proxy/HTTP1.xMessageFastParser.h>
-
+#include <hicn/http-proxy/http_session.h>
 #include <hicn/transport/http/request.h>
 #include <hicn/transport/http/response.h>
 
@@ -22,8 +21,6 @@
 #include <experimental/functional>
 #include <iostream>
 
-#include <hicn/http-proxy/http_session.h>
-
 constexpr char HTTPMessageFastParser::http_ok[];
 constexpr char HTTPMessageFastParser::http_cors[];
 constexpr char HTTPMessageFastParser::http_failed[];
diff --git a/apps/http-proxy/src/icn_receiver.cc b/apps/http-proxy/src/icn_receiver.cc
index 34b85f9c9..8823907dc 100644
--- a/apps/http-proxy/src/icn_receiver.cc
+++ b/apps/http-proxy/src/icn_receiver.cc
@@ -13,8 +13,9 @@
  * limitations under the License.
  */
 
+#include <hicn/http-proxy/http_1x_message_fast_parser.h>
 #include <hicn/http-proxy/icn_receiver.h>
-
+#include <hicn/http-proxy/utils.h>
 #include <hicn/transport/core/interest.h>
 #include <hicn/transport/http/default_values.h>
 #include <hicn/transport/utils/hash.h>
@@ -23,9 +24,6 @@
 #include <functional>
 #include <memory>
 
-#include <hicn/http-proxy/HTTP1.xMessageFastParser.h>
-#include <hicn/http-proxy/utils.h>
-
 namespace transport {
 
 AsyncConsumerProducer::AsyncConsumerProducer(