diff --git a/httpclient-2/.gitignore b/apache-httpclient-2/.gitignore
similarity index 100%
rename from httpclient-2/.gitignore
rename to apache-httpclient-2/.gitignore
diff --git a/httpclient-2/README.md b/apache-httpclient-2/README.md
similarity index 94%
rename from httpclient-2/README.md
rename to apache-httpclient-2/README.md
index 2e101a0609..338f10d765 100644
--- a/httpclient-2/README.md
+++ b/apache-httpclient-2/README.md
@@ -14,4 +14,4 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [Enabling Logging for Apache HttpClient](https://www.baeldung.com/apache-httpclient-enable-logging)
 - [Expand Shortened URLs with Apache HttpClient](https://www.baeldung.com/apache-httpclient-expand-url)
 - [Apache HttpClient vs. CloseableHttpClient](https://www.baeldung.com/apache-httpclient-vs-closeablehttpclient)
-- More articles: [[<-- prev]](../httpclient)
+- More articles: [[<-- prev]](../apache-httpclient)
diff --git a/httpclient-2/pom.xml b/apache-httpclient-2/pom.xml
similarity index 96%
rename from httpclient-2/pom.xml
rename to apache-httpclient-2/pom.xml
index f2da238494..c5b8195472 100644
--- a/httpclient-2/pom.xml
+++ b/apache-httpclient-2/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>httpclient-2</artifactId>
+    <artifactId>apache-httpclient-2</artifactId>
     <version>0.1-SNAPSHOT</version>
-    <name>httpclient-2</name>
+    <name>apache-httpclient-2</name>
 
     <parent>
         <groupId>com.baeldung</groupId>
@@ -74,7 +74,7 @@
     </dependencies>
 
     <build>
-        <finalName>httpclient-2</finalName>
+        <finalName>apache-httpclient-2</finalName>
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
diff --git a/httpclient-2/src/main/java/com/baeldung/tlsversion/ClientTlsVersionExamples.java b/apache-httpclient-2/src/main/java/com/baeldung/tlsversion/ClientTlsVersionExamples.java
similarity index 100%
rename from httpclient-2/src/main/java/com/baeldung/tlsversion/ClientTlsVersionExamples.java
rename to apache-httpclient-2/src/main/java/com/baeldung/tlsversion/ClientTlsVersionExamples.java
diff --git a/httpclient-2/src/test/java/com/baeldung/httpclient/cookies/HttpClientGettingCookieValueUnitTest.java b/apache-httpclient-2/src/test/java/com/baeldung/httpclient/cookies/HttpClientGettingCookieValueUnitTest.java
similarity index 100%
rename from httpclient-2/src/test/java/com/baeldung/httpclient/cookies/HttpClientGettingCookieValueUnitTest.java
rename to apache-httpclient-2/src/test/java/com/baeldung/httpclient/cookies/HttpClientGettingCookieValueUnitTest.java
diff --git a/httpclient-2/src/test/java/com/baeldung/httpclient/expandurl/HttpClientExpandUrlLiveTest.java b/apache-httpclient-2/src/test/java/com/baeldung/httpclient/expandurl/HttpClientExpandUrlLiveTest.java
similarity index 100%
rename from httpclient-2/src/test/java/com/baeldung/httpclient/expandurl/HttpClientExpandUrlLiveTest.java
rename to apache-httpclient-2/src/test/java/com/baeldung/httpclient/expandurl/HttpClientExpandUrlLiveTest.java
diff --git a/httpclient-2/src/test/java/com/baeldung/httpclient/httpclient/ApacheHttpClientUnitTest.java b/apache-httpclient-2/src/test/java/com/baeldung/httpclient/httpclient/ApacheHttpClientUnitTest.java
similarity index 100%
rename from httpclient-2/src/test/java/com/baeldung/httpclient/httpclient/ApacheHttpClientUnitTest.java
rename to apache-httpclient-2/src/test/java/com/baeldung/httpclient/httpclient/ApacheHttpClientUnitTest.java
diff --git a/httpclient-2/src/test/java/com/baeldung/httpclient/httpclient/GetRequestMockServer.java b/apache-httpclient-2/src/test/java/com/baeldung/httpclient/httpclient/GetRequestMockServer.java
similarity index 100%
rename from httpclient-2/src/test/java/com/baeldung/httpclient/httpclient/GetRequestMockServer.java
rename to apache-httpclient-2/src/test/java/com/baeldung/httpclient/httpclient/GetRequestMockServer.java
diff --git a/httpclient-2/src/test/java/com/baeldung/httpclient/readresponsebodystring/ApacheHttpClient5UnitTest.java b/apache-httpclient-2/src/test/java/com/baeldung/httpclient/readresponsebodystring/ApacheHttpClient5UnitTest.java
similarity index 100%
rename from httpclient-2/src/test/java/com/baeldung/httpclient/readresponsebodystring/ApacheHttpClient5UnitTest.java
rename to apache-httpclient-2/src/test/java/com/baeldung/httpclient/readresponsebodystring/ApacheHttpClient5UnitTest.java
diff --git a/httpclient-2/src/test/java/com/baeldung/httpclient/readresponsebodystring/ApacheHttpClientUnitTest.java b/apache-httpclient-2/src/test/java/com/baeldung/httpclient/readresponsebodystring/ApacheHttpClientUnitTest.java
similarity index 100%
rename from httpclient-2/src/test/java/com/baeldung/httpclient/readresponsebodystring/ApacheHttpClientUnitTest.java
rename to apache-httpclient-2/src/test/java/com/baeldung/httpclient/readresponsebodystring/ApacheHttpClientUnitTest.java
diff --git a/httpclient-2/src/test/java/com/baeldung/httpclient/readresponsebodystring/HttpClientUnitTest.java b/apache-httpclient-2/src/test/java/com/baeldung/httpclient/readresponsebodystring/HttpClientUnitTest.java
similarity index 100%
rename from httpclient-2/src/test/java/com/baeldung/httpclient/readresponsebodystring/HttpClientUnitTest.java
rename to apache-httpclient-2/src/test/java/com/baeldung/httpclient/readresponsebodystring/HttpClientUnitTest.java
diff --git a/httpclient-2/src/test/java/com/baeldung/httpclient/readresponsebodystring/HttpUrlConnectionUnitTest.java b/apache-httpclient-2/src/test/java/com/baeldung/httpclient/readresponsebodystring/HttpUrlConnectionUnitTest.java
similarity index 100%
rename from httpclient-2/src/test/java/com/baeldung/httpclient/readresponsebodystring/HttpUrlConnectionUnitTest.java
rename to apache-httpclient-2/src/test/java/com/baeldung/httpclient/readresponsebodystring/HttpUrlConnectionUnitTest.java
diff --git a/httpclient-2/src/test/java/com/baeldung/httpclient/readresponsebodystring/SpringRestTemplateUnitTest.java b/apache-httpclient-2/src/test/java/com/baeldung/httpclient/readresponsebodystring/SpringRestTemplateUnitTest.java
similarity index 100%
rename from httpclient-2/src/test/java/com/baeldung/httpclient/readresponsebodystring/SpringRestTemplateUnitTest.java
rename to apache-httpclient-2/src/test/java/com/baeldung/httpclient/readresponsebodystring/SpringRestTemplateUnitTest.java
diff --git a/httpclient-2/src/test/java/com/baeldung/httpclient/readresponsebodystring/SpringWebClientUnitTest.java b/apache-httpclient-2/src/test/java/com/baeldung/httpclient/readresponsebodystring/SpringWebClientUnitTest.java
similarity index 100%
rename from httpclient-2/src/test/java/com/baeldung/httpclient/readresponsebodystring/SpringWebClientUnitTest.java
rename to apache-httpclient-2/src/test/java/com/baeldung/httpclient/readresponsebodystring/SpringWebClientUnitTest.java
diff --git a/httpclient-2/src/test/resources/logback.xml b/apache-httpclient-2/src/test/resources/logback.xml
similarity index 100%
rename from httpclient-2/src/test/resources/logback.xml
rename to apache-httpclient-2/src/test/resources/logback.xml
diff --git a/httpclient/.gitignore b/apache-httpclient/.gitignore
similarity index 100%
rename from httpclient/.gitignore
rename to apache-httpclient/.gitignore
diff --git a/httpclient/README.md b/apache-httpclient/README.md
similarity index 95%
rename from httpclient/README.md
rename to apache-httpclient/README.md
index ea3bc28572..d7dddeb907 100644
--- a/httpclient/README.md
+++ b/apache-httpclient/README.md
@@ -17,4 +17,4 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [Apache HttpClient – Do Not Follow Redirects](https://www.baeldung.com/httpclient-stop-follow-redirect)
 - [Custom User-Agent in Apache HttpClient](https://www.baeldung.com/httpclient-user-agent-header)
 - [Apache HttpClient Connection Management](https://www.baeldung.com/httpclient-connection-management)
-- More articles: [[next -->]](../httpclient-2)
+- More articles: [[next -->]](../apache-httpclient-2)
diff --git a/httpclient/pom.xml b/apache-httpclient/pom.xml
similarity index 95%
rename from httpclient/pom.xml
rename to apache-httpclient/pom.xml
index b69981fb13..26eb319ac0 100644
--- a/httpclient/pom.xml
+++ b/apache-httpclient/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>httpclient</artifactId>
+    <artifactId>apache-httpclient</artifactId>
     <version>0.1-SNAPSHOT</version>
-    <name>httpclient</name>
+    <name>apache-httpclient</name>
 
     <parent>
         <groupId>com.baeldung</groupId>
@@ -63,7 +63,7 @@
     </dependencies>
 
     <build>
-        <finalName>httpclient</finalName>
+        <finalName>apache-httpclient</finalName>
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
diff --git a/httpclient/src/main/resources/logback.xml b/apache-httpclient/src/main/resources/logback.xml
similarity index 100%
rename from httpclient/src/main/resources/logback.xml
rename to apache-httpclient/src/main/resources/logback.xml
diff --git a/httpclient/src/main/resources/temp.txt b/apache-httpclient/src/main/resources/temp.txt
similarity index 100%
rename from httpclient/src/main/resources/temp.txt
rename to apache-httpclient/src/main/resources/temp.txt
diff --git a/httpclient/src/test/java/com/baeldung/httpclient/HttpAsyncClientLiveTest.java b/apache-httpclient/src/test/java/com/baeldung/httpclient/HttpAsyncClientLiveTest.java
similarity index 100%
rename from httpclient/src/test/java/com/baeldung/httpclient/HttpAsyncClientLiveTest.java
rename to apache-httpclient/src/test/java/com/baeldung/httpclient/HttpAsyncClientLiveTest.java
diff --git a/httpclient/src/test/java/com/baeldung/httpclient/HttpClientMultipartLiveTest.java b/apache-httpclient/src/test/java/com/baeldung/httpclient/HttpClientMultipartLiveTest.java
similarity index 100%
rename from httpclient/src/test/java/com/baeldung/httpclient/HttpClientMultipartLiveTest.java
rename to apache-httpclient/src/test/java/com/baeldung/httpclient/HttpClientMultipartLiveTest.java
diff --git a/httpclient/src/test/java/com/baeldung/httpclient/HttpClientRedirectLiveTest.java b/apache-httpclient/src/test/java/com/baeldung/httpclient/HttpClientRedirectLiveTest.java
similarity index 100%
rename from httpclient/src/test/java/com/baeldung/httpclient/HttpClientRedirectLiveTest.java
rename to apache-httpclient/src/test/java/com/baeldung/httpclient/HttpClientRedirectLiveTest.java
diff --git a/httpclient/src/test/java/com/baeldung/httpclient/ResponseUtil.java b/apache-httpclient/src/test/java/com/baeldung/httpclient/ResponseUtil.java
similarity index 100%
rename from httpclient/src/test/java/com/baeldung/httpclient/ResponseUtil.java
rename to apache-httpclient/src/test/java/com/baeldung/httpclient/ResponseUtil.java
diff --git a/httpclient/src/test/java/com/baeldung/httpclient/advancedconfig/HttpClientAdvancedConfigurationIntegrationTest.java b/apache-httpclient/src/test/java/com/baeldung/httpclient/advancedconfig/HttpClientAdvancedConfigurationIntegrationTest.java
similarity index 100%
rename from httpclient/src/test/java/com/baeldung/httpclient/advancedconfig/HttpClientAdvancedConfigurationIntegrationTest.java
rename to apache-httpclient/src/test/java/com/baeldung/httpclient/advancedconfig/HttpClientAdvancedConfigurationIntegrationTest.java
diff --git a/httpclient/src/test/java/com/baeldung/httpclient/base/HttpClientBasicPostLiveTest.java b/apache-httpclient/src/test/java/com/baeldung/httpclient/base/HttpClientBasicPostLiveTest.java
similarity index 100%
rename from httpclient/src/test/java/com/baeldung/httpclient/base/HttpClientBasicPostLiveTest.java
rename to apache-httpclient/src/test/java/com/baeldung/httpclient/base/HttpClientBasicPostLiveTest.java
diff --git a/httpclient/src/test/java/com/baeldung/httpclient/base/HttpClientLiveTest.java b/apache-httpclient/src/test/java/com/baeldung/httpclient/base/HttpClientLiveTest.java
similarity index 100%
rename from httpclient/src/test/java/com/baeldung/httpclient/base/HttpClientLiveTest.java
rename to apache-httpclient/src/test/java/com/baeldung/httpclient/base/HttpClientLiveTest.java
diff --git a/httpclient/src/test/java/com/baeldung/httpclient/base/HttpClientSandboxLiveTest.java b/apache-httpclient/src/test/java/com/baeldung/httpclient/base/HttpClientSandboxLiveTest.java
similarity index 100%
rename from httpclient/src/test/java/com/baeldung/httpclient/base/HttpClientSandboxLiveTest.java
rename to apache-httpclient/src/test/java/com/baeldung/httpclient/base/HttpClientSandboxLiveTest.java
diff --git a/httpclient/src/test/java/com/baeldung/httpclient/conn/HttpClientConnectionManagementLiveTest.java b/apache-httpclient/src/test/java/com/baeldung/httpclient/conn/HttpClientConnectionManagementLiveTest.java
similarity index 100%
rename from httpclient/src/test/java/com/baeldung/httpclient/conn/HttpClientConnectionManagementLiveTest.java
rename to apache-httpclient/src/test/java/com/baeldung/httpclient/conn/HttpClientConnectionManagementLiveTest.java
diff --git a/httpclient/src/test/java/com/baeldung/httpclient/conn/IdleConnectionMonitorThread.java b/apache-httpclient/src/test/java/com/baeldung/httpclient/conn/IdleConnectionMonitorThread.java
similarity index 100%
rename from httpclient/src/test/java/com/baeldung/httpclient/conn/IdleConnectionMonitorThread.java
rename to apache-httpclient/src/test/java/com/baeldung/httpclient/conn/IdleConnectionMonitorThread.java
diff --git a/httpclient/src/test/java/com/baeldung/httpclient/conn/MultiHttpClientConnThread.java b/apache-httpclient/src/test/java/com/baeldung/httpclient/conn/MultiHttpClientConnThread.java
similarity index 100%
rename from httpclient/src/test/java/com/baeldung/httpclient/conn/MultiHttpClientConnThread.java
rename to apache-httpclient/src/test/java/com/baeldung/httpclient/conn/MultiHttpClientConnThread.java
diff --git a/httpclient/src/test/java/com/baeldung/httpclient/conn/TesterVersion_MultiHttpClientConnThread.java b/apache-httpclient/src/test/java/com/baeldung/httpclient/conn/TesterVersion_MultiHttpClientConnThread.java
similarity index 100%
rename from httpclient/src/test/java/com/baeldung/httpclient/conn/TesterVersion_MultiHttpClientConnThread.java
rename to apache-httpclient/src/test/java/com/baeldung/httpclient/conn/TesterVersion_MultiHttpClientConnThread.java
diff --git a/httpclient/src/test/resources/.gitignore b/apache-httpclient/src/test/resources/.gitignore
similarity index 100%
rename from httpclient/src/test/resources/.gitignore
rename to apache-httpclient/src/test/resources/.gitignore
diff --git a/httpclient/src/test/resources/test.in b/apache-httpclient/src/test/resources/test.in
similarity index 100%
rename from httpclient/src/test/resources/test.in
rename to apache-httpclient/src/test/resources/test.in
diff --git a/httpclient/src/test/resources/uploads/image.jpg b/apache-httpclient/src/test/resources/uploads/image.jpg
similarity index 100%
rename from httpclient/src/test/resources/uploads/image.jpg
rename to apache-httpclient/src/test/resources/uploads/image.jpg
diff --git a/httpclient/src/test/resources/uploads/sandbox.txt b/apache-httpclient/src/test/resources/uploads/sandbox.txt
similarity index 100%
rename from httpclient/src/test/resources/uploads/sandbox.txt
rename to apache-httpclient/src/test/resources/uploads/sandbox.txt
diff --git a/httpclient/src/test/resources/uploads/temp.txt b/apache-httpclient/src/test/resources/uploads/temp.txt
similarity index 100%
rename from httpclient/src/test/resources/uploads/temp.txt
rename to apache-httpclient/src/test/resources/uploads/temp.txt
diff --git a/httpclient/src/test/resources/uploads/zipFile.zip b/apache-httpclient/src/test/resources/uploads/zipFile.zip
similarity index 100%
rename from httpclient/src/test/resources/uploads/zipFile.zip
rename to apache-httpclient/src/test/resources/uploads/zipFile.zip
diff --git a/pom.xml b/pom.xml
index e47d3aa4dd..25aeebef9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -425,7 +425,7 @@
 
                 <module>hazelcast</module>
                 <module>helidon</module>
-                <module>httpclient</module>
+                <module>apache-httpclient</module>
                 <module>httpclient-simple</module>
                 <module>hystrix</module>
 
@@ -906,7 +906,7 @@
 
                 <module>hazelcast</module>
                 <module>helidon</module>
-                <module>httpclient</module>
+                <module>apache-httpclient</module>
                 <module>httpclient-simple</module>
                 <module>hystrix</module>                
 
@@ -1340,7 +1340,7 @@
                  <module>core-java-modules/core-java-strings</module>
                  <module>ddd-modules</module>
                  <module>docker</module>
-                 <module>httpclient-2</module>
+                 <module>apache-httpclient-2</module>
                  <module>libraries-concurrency</module>
                  <module>persistence-modules/sirix</module>
                  <module>persistence-modules/spring-data-cassandra-2</module>
@@ -1407,7 +1407,7 @@
                 <module>core-java-modules/core-java-strings</module>
                 <module>ddd-modules</module>
                 <module>docker</module>
-                <module>httpclient-2</module>
+                <module>apache-httpclient-2</module>
                 <module>libraries-concurrency</module>
                 <module>persistence-modules/sirix</module>
                 <module>persistence-modules/spring-data-cassandra-2</module>