diff --git a/components/esp32/esp_err_to_name.c b/components/esp32/esp_err_to_name.c
index 3882d4bf4f..dd1b81614c 100644
--- a/components/esp32/esp_err_to_name.c
+++ b/components/esp32/esp_err_to_name.c
@@ -13,6 +13,9 @@
 #if __has_include("esp_http_client.h")
 #include "esp_http_client.h"
 #endif
+#if __has_include("esp_http_server.h")
+#include "esp_http_server.h"
+#endif
 #if __has_include("esp_image_format.h")
 #include "esp_image_format.h"
 #endif
@@ -37,9 +40,6 @@
 #if __has_include("esp_wps.h")
 #include "esp_wps.h"
 #endif
-#if __has_include("http_server.h")
-#include "http_server.h"
-#endif
 #if __has_include("nvs.h")
 #include "nvs.h"
 #endif
@@ -456,7 +456,7 @@ static const esp_err_msg_t esp_err_msg_table[] = {
 #   ifdef      ESP_ERR_HTTP_EAGAIN
     ERR_TBL_IT(ESP_ERR_HTTP_EAGAIN),                        /* 28679 0x7007 Mapping of errno EAGAIN to esp_err_t */
 #   endif
-    // components/http_server/include/http_server.h
+    // components/esp_http_server/include/esp_http_server.h
 #   ifdef      ESP_ERR_HTTPD_BASE
     ERR_TBL_IT(ESP_ERR_HTTPD_BASE),                         /* 32768 0x8000 Starting number of HTTPD error codes */
 #   endif
diff --git a/components/http_server/CMakeLists.txt b/components/esp_http_server/CMakeLists.txt
similarity index 100%
rename from components/http_server/CMakeLists.txt
rename to components/esp_http_server/CMakeLists.txt
diff --git a/components/http_server/Kconfig b/components/esp_http_server/Kconfig
similarity index 100%
rename from components/http_server/Kconfig
rename to components/esp_http_server/Kconfig
diff --git a/components/http_server/component.mk b/components/esp_http_server/component.mk
similarity index 100%
rename from components/http_server/component.mk
rename to components/esp_http_server/component.mk
diff --git a/components/http_server/include/http_server.h b/components/esp_http_server/include/esp_http_server.h
similarity index 99%
rename from components/http_server/include/http_server.h
rename to components/esp_http_server/include/esp_http_server.h
index 6a8e65c794..4880c66acd 100644
--- a/components/http_server/include/http_server.h
+++ b/components/esp_http_server/include/esp_http_server.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _HTTP_SERVER_H_
-#define _HTTP_SERVER_H_
+#ifndef _ESP_HTTP_SERVER_H_
+#define _ESP_HTTP_SERVER_H_
 
 #include <stdio.h>
 #include <string.h>
@@ -993,4 +993,4 @@ esp_err_t httpd_queue_work(httpd_handle_t handle, httpd_work_fn_t work, void *ar
 }
 #endif
 
-#endif /* ! _HTTP_SERVER_H_ */
+#endif /* ! _ESP_HTTP_SERVER_H_ */
diff --git a/components/esp_http_server/include/http_server.h b/components/esp_http_server/include/http_server.h
new file mode 100644
index 0000000000..56f73c5b74
--- /dev/null
+++ b/components/esp_http_server/include/http_server.h
@@ -0,0 +1,2 @@
+#warning http_server.h has been renamed to esp_http_server.h, please update include directives
+#include "esp_http_server.h"
diff --git a/components/http_server/src/httpd_priv.h b/components/esp_http_server/src/esp_httpd_priv.h
similarity index 99%
rename from components/http_server/src/httpd_priv.h
rename to components/esp_http_server/src/esp_httpd_priv.h
index 7339ec03ef..ff619e39e9 100644
--- a/components/http_server/src/httpd_priv.h
+++ b/components/esp_http_server/src/esp_httpd_priv.h
@@ -22,8 +22,8 @@
 #include <netinet/in.h>
 #include <esp_log.h>
 #include <esp_err.h>
-#include <http_server.h>
 
+#include <esp_http_server.h>
 #include "osal.h"
 
 #ifdef __cplusplus
diff --git a/components/http_server/src/httpd_main.c b/components/esp_http_server/src/httpd_main.c
similarity index 99%
rename from components/http_server/src/httpd_main.c
rename to components/esp_http_server/src/httpd_main.c
index 729ec11633..c4bcf68d77 100644
--- a/components/http_server/src/httpd_main.c
+++ b/components/esp_http_server/src/httpd_main.c
@@ -20,8 +20,8 @@
 #include <esp_err.h>
 #include <assert.h>
 
-#include <http_server.h>
-#include "httpd_priv.h"
+#include <esp_http_server.h>
+#include "esp_httpd_priv.h"
 #include "ctrl_sock.h"
 
 static const char *TAG = "httpd";
diff --git a/components/http_server/src/httpd_parse.c b/components/esp_http_server/src/httpd_parse.c
similarity index 99%
rename from components/http_server/src/httpd_parse.c
rename to components/esp_http_server/src/httpd_parse.c
index 9a15e2f207..93b5abddc3 100644
--- a/components/http_server/src/httpd_parse.c
+++ b/components/esp_http_server/src/httpd_parse.c
@@ -18,9 +18,9 @@
 #include <esp_log.h>
 #include <esp_err.h>
 #include <http_parser.h>
-#include <http_server.h>
 
-#include "httpd_priv.h"
+#include <esp_http_server.h>
+#include "esp_httpd_priv.h"
 #include "osal.h"
 
 static const char *TAG = "httpd_parse";
diff --git a/components/http_server/src/httpd_sess.c b/components/esp_http_server/src/httpd_sess.c
similarity index 99%
rename from components/http_server/src/httpd_sess.c
rename to components/esp_http_server/src/httpd_sess.c
index 2049b2b68e..b3561aab35 100644
--- a/components/http_server/src/httpd_sess.c
+++ b/components/esp_http_server/src/httpd_sess.c
@@ -17,8 +17,8 @@
 #include <esp_log.h>
 #include <esp_err.h>
 
-#include <http_server.h>
-#include "httpd_priv.h"
+#include <esp_http_server.h>
+#include "esp_httpd_priv.h"
 
 static const char *TAG = "httpd_sess";
 
diff --git a/components/http_server/src/httpd_txrx.c b/components/esp_http_server/src/httpd_txrx.c
similarity index 99%
rename from components/http_server/src/httpd_txrx.c
rename to components/esp_http_server/src/httpd_txrx.c
index 1ccebabe4f..5ab80295d2 100644
--- a/components/http_server/src/httpd_txrx.c
+++ b/components/esp_http_server/src/httpd_txrx.c
@@ -17,8 +17,8 @@
 #include <esp_log.h>
 #include <esp_err.h>
 
-#include <http_server.h>
-#include "httpd_priv.h"
+#include <esp_http_server.h>
+#include "esp_httpd_priv.h"
 
 static const char *TAG = "httpd_txrx";
 
diff --git a/components/http_server/src/httpd_uri.c b/components/esp_http_server/src/httpd_uri.c
similarity index 99%
rename from components/http_server/src/httpd_uri.c
rename to components/esp_http_server/src/httpd_uri.c
index b74a7f62a3..9652c9439a 100644
--- a/components/http_server/src/httpd_uri.c
+++ b/components/esp_http_server/src/httpd_uri.c
@@ -18,8 +18,8 @@
 #include <esp_err.h>
 #include <http_parser.h>
 
-#include <http_server.h>
-#include "httpd_priv.h"
+#include <esp_http_server.h>
+#include "esp_httpd_priv.h"
 
 static const char *TAG = "httpd_uri";
 
diff --git a/components/http_server/src/port/esp32/osal.h b/components/esp_http_server/src/port/esp32/osal.h
similarity index 100%
rename from components/http_server/src/port/esp32/osal.h
rename to components/esp_http_server/src/port/esp32/osal.h
diff --git a/components/http_server/src/util/ctrl_sock.c b/components/esp_http_server/src/util/ctrl_sock.c
similarity index 100%
rename from components/http_server/src/util/ctrl_sock.c
rename to components/esp_http_server/src/util/ctrl_sock.c
diff --git a/components/http_server/src/util/ctrl_sock.h b/components/esp_http_server/src/util/ctrl_sock.h
similarity index 100%
rename from components/http_server/src/util/ctrl_sock.h
rename to components/esp_http_server/src/util/ctrl_sock.h
diff --git a/components/esp_http_server/test/CMakeLists.txt b/components/esp_http_server/test/CMakeLists.txt
new file mode 100644
index 0000000000..7587213bda
--- /dev/null
+++ b/components/esp_http_server/test/CMakeLists.txt
@@ -0,0 +1,6 @@
+set(COMPONENT_SRCDIRS ".")
+set(COMPONENT_ADD_INCLUDEDIRS ".")
+
+set(COMPONENT_REQUIRES unity esp_http_server)
+
+register_component()
diff --git a/components/http_server/test/component.mk b/components/esp_http_server/test/component.mk
similarity index 100%
rename from components/http_server/test/component.mk
rename to components/esp_http_server/test/component.mk
diff --git a/components/http_server/test/test_http_server.c b/components/esp_http_server/test/test_http_server.c
similarity index 99%
rename from components/http_server/test/test_http_server.c
rename to components/esp_http_server/test/test_http_server.c
index 07c91add5c..e343c99ca4 100644
--- a/components/http_server/test/test_http_server.c
+++ b/components/esp_http_server/test/test_http_server.c
@@ -15,7 +15,7 @@
 #include <stdlib.h>
 #include <stdbool.h>
 #include <esp_system.h>
-#include <http_server.h>
+#include <esp_http_server.h>
 
 #include "unity.h"
 #include "test_utils.h"
diff --git a/components/http_server/test/CMakeLists.txt b/components/http_server/test/CMakeLists.txt
deleted file mode 100644
index 1c577575ab..0000000000
--- a/components/http_server/test/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-set(COMPONENT_SRCDIRS ".")
-set(COMPONENT_ADD_INCLUDEDIRS ".")
-
-set(COMPONENT_REQUIRES unity http_server)
-
-register_component()
\ No newline at end of file