diff --git a/httpclient4/.gitignore b/apache-httpclient4/.gitignore
similarity index 100%
rename from httpclient4/.gitignore
rename to apache-httpclient4/.gitignore
diff --git a/httpclient4/README.md b/apache-httpclient4/README.md
similarity index 96%
rename from httpclient4/README.md
rename to apache-httpclient4/README.md
index 445db1108b..25791d05e6 100644
--- a/httpclient4/README.md
+++ b/apache-httpclient4/README.md
@@ -1,4 +1,4 @@
-## Apache HttpClient
+## Apache HttpClient 4
 
 This module contains articles about Apache HttpClient 4.5
 
diff --git a/httpclient4/pom.xml b/apache-httpclient4/pom.xml
similarity index 99%
rename from httpclient4/pom.xml
rename to apache-httpclient4/pom.xml
index 8f896283b3..6b449e3be1 100644
--- a/httpclient4/pom.xml
+++ b/apache-httpclient4/pom.xml
@@ -3,9 +3,9 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>httpclient4</artifactId>
+    <artifactId>apache-httpclient4</artifactId>
     <version>0.1-SNAPSHOT</version>
-    <name>httpclient4</name>
+    <name>apache-httpclient4</name>
     <packaging>war</packaging>
 
     <parent>
diff --git a/httpclient4/src/main/java/com/baeldung/basic/MyBasicAuthenticationEntryPoint.java b/apache-httpclient4/src/main/java/com/baeldung/basic/MyBasicAuthenticationEntryPoint.java
similarity index 100%
rename from httpclient4/src/main/java/com/baeldung/basic/MyBasicAuthenticationEntryPoint.java
rename to apache-httpclient4/src/main/java/com/baeldung/basic/MyBasicAuthenticationEntryPoint.java
diff --git a/httpclient4/src/main/java/com/baeldung/client/HttpComponentsClientHttpRequestFactoryBasicAuth.java b/apache-httpclient4/src/main/java/com/baeldung/client/HttpComponentsClientHttpRequestFactoryBasicAuth.java
similarity index 100%
rename from httpclient4/src/main/java/com/baeldung/client/HttpComponentsClientHttpRequestFactoryBasicAuth.java
rename to apache-httpclient4/src/main/java/com/baeldung/client/HttpComponentsClientHttpRequestFactoryBasicAuth.java
diff --git a/httpclient4/src/main/java/com/baeldung/client/RestTemplateFactory.java b/apache-httpclient4/src/main/java/com/baeldung/client/RestTemplateFactory.java
similarity index 100%
rename from httpclient4/src/main/java/com/baeldung/client/RestTemplateFactory.java
rename to apache-httpclient4/src/main/java/com/baeldung/client/RestTemplateFactory.java
diff --git a/httpclient4/src/main/java/com/baeldung/client/spring/ClientConfig.java b/apache-httpclient4/src/main/java/com/baeldung/client/spring/ClientConfig.java
similarity index 100%
rename from httpclient4/src/main/java/com/baeldung/client/spring/ClientConfig.java
rename to apache-httpclient4/src/main/java/com/baeldung/client/spring/ClientConfig.java
diff --git a/httpclient4/src/main/java/com/baeldung/filter/CustomFilter.java b/apache-httpclient4/src/main/java/com/baeldung/filter/CustomFilter.java
similarity index 100%
rename from httpclient4/src/main/java/com/baeldung/filter/CustomFilter.java
rename to apache-httpclient4/src/main/java/com/baeldung/filter/CustomFilter.java
diff --git a/httpclient4/src/main/java/com/baeldung/filter/CustomWebSecurityConfigurerAdapter.java b/apache-httpclient4/src/main/java/com/baeldung/filter/CustomWebSecurityConfigurerAdapter.java
similarity index 100%
rename from httpclient4/src/main/java/com/baeldung/filter/CustomWebSecurityConfigurerAdapter.java
rename to apache-httpclient4/src/main/java/com/baeldung/filter/CustomWebSecurityConfigurerAdapter.java
diff --git a/httpclient4/src/main/java/com/baeldung/security/MySavedRequestAwareAuthenticationSuccessHandler.java b/apache-httpclient4/src/main/java/com/baeldung/security/MySavedRequestAwareAuthenticationSuccessHandler.java
similarity index 100%
rename from httpclient4/src/main/java/com/baeldung/security/MySavedRequestAwareAuthenticationSuccessHandler.java
rename to apache-httpclient4/src/main/java/com/baeldung/security/MySavedRequestAwareAuthenticationSuccessHandler.java
diff --git a/httpclient4/src/main/java/com/baeldung/security/RestAuthenticationEntryPoint.java b/apache-httpclient4/src/main/java/com/baeldung/security/RestAuthenticationEntryPoint.java
similarity index 100%
rename from httpclient4/src/main/java/com/baeldung/security/RestAuthenticationEntryPoint.java
rename to apache-httpclient4/src/main/java/com/baeldung/security/RestAuthenticationEntryPoint.java
diff --git a/httpclient4/src/main/java/com/baeldung/spring/SecSecurityConfig.java b/apache-httpclient4/src/main/java/com/baeldung/spring/SecSecurityConfig.java
similarity index 100%
rename from httpclient4/src/main/java/com/baeldung/spring/SecSecurityConfig.java
rename to apache-httpclient4/src/main/java/com/baeldung/spring/SecSecurityConfig.java
diff --git a/httpclient4/src/main/java/com/baeldung/spring/WebConfig.java b/apache-httpclient4/src/main/java/com/baeldung/spring/WebConfig.java
similarity index 100%
rename from httpclient4/src/main/java/com/baeldung/spring/WebConfig.java
rename to apache-httpclient4/src/main/java/com/baeldung/spring/WebConfig.java
diff --git a/httpclient4/src/main/java/com/baeldung/web/controller/BarController.java b/apache-httpclient4/src/main/java/com/baeldung/web/controller/BarController.java
similarity index 100%
rename from httpclient4/src/main/java/com/baeldung/web/controller/BarController.java
rename to apache-httpclient4/src/main/java/com/baeldung/web/controller/BarController.java
diff --git a/httpclient4/src/main/java/com/baeldung/web/controller/FooController.java b/apache-httpclient4/src/main/java/com/baeldung/web/controller/FooController.java
similarity index 100%
rename from httpclient4/src/main/java/com/baeldung/web/controller/FooController.java
rename to apache-httpclient4/src/main/java/com/baeldung/web/controller/FooController.java
diff --git a/httpclient4/src/main/java/com/baeldung/web/dto/Bar.java b/apache-httpclient4/src/main/java/com/baeldung/web/dto/Bar.java
similarity index 100%
rename from httpclient4/src/main/java/com/baeldung/web/dto/Bar.java
rename to apache-httpclient4/src/main/java/com/baeldung/web/dto/Bar.java
diff --git a/httpclient4/src/main/java/com/baeldung/web/dto/Foo.java b/apache-httpclient4/src/main/java/com/baeldung/web/dto/Foo.java
similarity index 100%
rename from httpclient4/src/main/java/com/baeldung/web/dto/Foo.java
rename to apache-httpclient4/src/main/java/com/baeldung/web/dto/Foo.java
diff --git a/httpclient4/src/main/resources/logback.xml b/apache-httpclient4/src/main/resources/logback.xml
similarity index 100%
rename from httpclient4/src/main/resources/logback.xml
rename to apache-httpclient4/src/main/resources/logback.xml
diff --git a/httpclient4/src/main/resources/webSecurityConfig.xml b/apache-httpclient4/src/main/resources/webSecurityConfig.xml
similarity index 100%
rename from httpclient4/src/main/resources/webSecurityConfig.xml
rename to apache-httpclient4/src/main/resources/webSecurityConfig.xml
diff --git a/httpclient4/src/main/webapp/WEB-INF/api-servlet.xml b/apache-httpclient4/src/main/webapp/WEB-INF/api-servlet.xml
similarity index 100%
rename from httpclient4/src/main/webapp/WEB-INF/api-servlet.xml
rename to apache-httpclient4/src/main/webapp/WEB-INF/api-servlet.xml
diff --git a/httpclient4/src/main/webapp/WEB-INF/web.xml b/apache-httpclient4/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from httpclient4/src/main/webapp/WEB-INF/web.xml
rename to apache-httpclient4/src/main/webapp/WEB-INF/web.xml
diff --git a/httpclient4/src/test/java/com/baeldung/client/ClientLiveTest.java b/apache-httpclient4/src/test/java/com/baeldung/client/ClientLiveTest.java
similarity index 100%
rename from httpclient4/src/test/java/com/baeldung/client/ClientLiveTest.java
rename to apache-httpclient4/src/test/java/com/baeldung/client/ClientLiveTest.java
diff --git a/httpclient4/src/test/java/com/baeldung/client/RestClientV4LiveManualTest.java b/apache-httpclient4/src/test/java/com/baeldung/client/RestClientV4LiveManualTest.java
similarity index 100%
rename from httpclient4/src/test/java/com/baeldung/client/RestClientV4LiveManualTest.java
rename to apache-httpclient4/src/test/java/com/baeldung/client/RestClientV4LiveManualTest.java
diff --git a/httpclient4/src/test/java/com/baeldung/httpclient/HttpClientHeaderV4LiveTest.java b/apache-httpclient4/src/test/java/com/baeldung/httpclient/HttpClientHeaderV4LiveTest.java
similarity index 100%
rename from httpclient4/src/test/java/com/baeldung/httpclient/HttpClientHeaderV4LiveTest.java
rename to apache-httpclient4/src/test/java/com/baeldung/httpclient/HttpClientHeaderV4LiveTest.java
diff --git a/httpclient4/src/test/java/com/baeldung/httpclient/HttpClientTimeoutV4LiveTest.java b/apache-httpclient4/src/test/java/com/baeldung/httpclient/HttpClientTimeoutV4LiveTest.java
similarity index 100%
rename from httpclient4/src/test/java/com/baeldung/httpclient/HttpClientTimeoutV4LiveTest.java
rename to apache-httpclient4/src/test/java/com/baeldung/httpclient/HttpClientTimeoutV4LiveTest.java
diff --git a/httpclient4/src/test/java/com/baeldung/httpclient/HttpsClientV4SslLiveTest.java b/apache-httpclient4/src/test/java/com/baeldung/httpclient/HttpsClientV4SslLiveTest.java
similarity index 100%
rename from httpclient4/src/test/java/com/baeldung/httpclient/HttpsClientV4SslLiveTest.java
rename to apache-httpclient4/src/test/java/com/baeldung/httpclient/HttpsClientV4SslLiveTest.java
diff --git a/httpclient4/src/test/java/com/baeldung/httpclient/ResponseUtil.java b/apache-httpclient4/src/test/java/com/baeldung/httpclient/ResponseUtil.java
similarity index 100%
rename from httpclient4/src/test/java/com/baeldung/httpclient/ResponseUtil.java
rename to apache-httpclient4/src/test/java/com/baeldung/httpclient/ResponseUtil.java
diff --git a/httpclient4/src/test/resources/.gitignore b/apache-httpclient4/src/test/resources/.gitignore
similarity index 100%
rename from httpclient4/src/test/resources/.gitignore
rename to apache-httpclient4/src/test/resources/.gitignore
diff --git a/httpclient4/src/test/resources/test.in b/apache-httpclient4/src/test/resources/test.in
similarity index 100%
rename from httpclient4/src/test/resources/test.in
rename to apache-httpclient4/src/test/resources/test.in
diff --git a/pom.xml b/pom.xml
index 9ef2b0df97..79ab649cea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -349,7 +349,7 @@
                 <!-- <module>guest</module> --> <!-- not to be built as its for guest articles  -->
 
                 <module>apache-httpclient</module>
-                <module>httpclient4</module>
+                <module>apache-httpclient4</module>
 
 
                 <module>jackson-modules</module>
@@ -604,7 +604,7 @@
                 <!-- <module>guest</module> --> <!-- not to be built as its for guest articles  -->
 
                 <module>apache-httpclient</module>
-                <module>httpclient4</module>
+                <module>apache-httpclient4</module>
 
 
                 <module>jackson-modules</module>