diff --git a/_test/tests/inc/httpclient_mock.php b/_test/tests/inc/httpclient_mock.php
index 893ed2a1e..56b99b7a2 100644
--- a/_test/tests/inc/httpclient_mock.php
+++ b/_test/tests/inc/httpclient_mock.php
@@ -1,6 +1,6 @@
 <?php
 
-use dokuwiki\HTTPClient\HTTPClient;
+use dokuwiki\HTTP\HTTPClient;
 
 /**
  * Class HTTPMockClient
diff --git a/_test/tests/inc/mailer.test.php b/_test/tests/inc/mailer.test.php
index 61a9af090..9f15cf36d 100644
--- a/_test/tests/inc/mailer.test.php
+++ b/_test/tests/inc/mailer.test.php
@@ -1,6 +1,6 @@
 <?php
 
-use dokuwiki\HTTPClient\HTTPClient;
+use dokuwiki\HTTP\HTTPClient;
 
 /**
  * Extends the mailer class to expose internal variables for testing
diff --git a/inc/FeedParserFile.php b/inc/FeedParserFile.php
index 5256cd6e5..be3417e9b 100644
--- a/inc/FeedParserFile.php
+++ b/inc/FeedParserFile.php
@@ -2,7 +2,7 @@
 
 namespace dokuwiki;
 
-use dokuwiki\HTTPClient\DokuHTTPClient;
+use dokuwiki\HTTP\DokuHTTPClient;
 
 /**
  * Fetch an URL using our own HTTPClient
diff --git a/inc/HTTPClient/DokuHTTPClient.php b/inc/HTTP/DokuHTTPClient.php
similarity index 98%
rename from inc/HTTPClient/DokuHTTPClient.php
rename to inc/HTTP/DokuHTTPClient.php
index 35c6f0b8e..b1db7e3c5 100644
--- a/inc/HTTPClient/DokuHTTPClient.php
+++ b/inc/HTTP/DokuHTTPClient.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace dokuwiki\HTTPClient;
+namespace dokuwiki\HTTP;
 
 
 
diff --git a/inc/HTTPClient/HTTPClient.php b/inc/HTTP/HTTPClient.php
similarity index 99%
rename from inc/HTTPClient/HTTPClient.php
rename to inc/HTTP/HTTPClient.php
index 535feb8b5..c916d77f0 100644
--- a/inc/HTTPClient/HTTPClient.php
+++ b/inc/HTTP/HTTPClient.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace dokuwiki\HTTPClient;
+namespace dokuwiki\HTTP;
 
 define('HTTP_NL',"\r\n");
 
diff --git a/inc/HTTPClient/HTTPClientException.php b/inc/HTTP/HTTPClientException.php
similarity index 70%
rename from inc/HTTPClient/HTTPClientException.php
rename to inc/HTTP/HTTPClientException.php
index 1ee5a0bd1..5b8f4eeca 100644
--- a/inc/HTTPClient/HTTPClientException.php
+++ b/inc/HTTP/HTTPClientException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace dokuwiki\HTTPClient;
+namespace dokuwiki\HTTP;
 
 use Exception;
 
diff --git a/inc/IXR_Library.php b/inc/IXR_Library.php
index 86a622f7a..e671b6880 100644
--- a/inc/IXR_Library.php
+++ b/inc/IXR_Library.php
@@ -1,6 +1,6 @@
 <?php
 
-use dokuwiki\HTTPClient\DokuHTTPClient;
+use dokuwiki\HTTP\DokuHTTPClient;
 
 /**
  * IXR - The Incutio XML-RPC Library
diff --git a/inc/Sitemap/Mapper.php b/inc/Sitemap/Mapper.php
index 8c4f26c14..7aef61a87 100644
--- a/inc/Sitemap/Mapper.php
+++ b/inc/Sitemap/Mapper.php
@@ -8,7 +8,7 @@
 
 namespace dokuwiki\Sitemap;
 
-use dokuwiki\HTTPClient\DokuHTTPClient;
+use dokuwiki\HTTP\DokuHTTPClient;
 
 /**
  * A class for building sitemaps and pinging search engines with the sitemap URL.
diff --git a/inc/deprecated.php b/inc/deprecated.php
index da983cfcd..549e5f11a 100644
--- a/inc/deprecated.php
+++ b/inc/deprecated.php
@@ -268,9 +268,9 @@ class PassHash extends \dokuwiki\PassHash {
 }
 
 /**
- * @deprecated since 2019-03-17 use \dokuwiki\HTTPClient\HTTPClientException instead!
+ * @deprecated since 2019-03-17 use \dokuwiki\HTTP\HTTPClientException instead!
  */
-class HTTPClientException extends \dokuwiki\HTTPClient\HTTPClientException {
+class HTTPClientException extends \dokuwiki\HTTP\HTTPClientException {
 
     /**
      * @inheritdoc
@@ -278,15 +278,15 @@ class HTTPClientException extends \dokuwiki\HTTPClient\HTTPClientException {
      */
     public function __construct($message = '', $code = 0, $previous = null)
     {
-        DebugHelper::dbgDeprecatedFunction(dokuwiki\HTTPClient\HTTPClientException::class);
+        DebugHelper::dbgDeprecatedFunction(dokuwiki\HTTP\HTTPClientException::class);
         parent::__construct($message, $code, $previous);
     }
 }
 
 /**
- * @deprecated since 2019-03-17 use \dokuwiki\HTTPClient\HTTPClient instead!
+ * @deprecated since 2019-03-17 use \dokuwiki\HTTP\HTTPClient instead!
  */
-class HTTPClient extends \dokuwiki\HTTPClient\HTTPClient {
+class HTTPClient extends \dokuwiki\HTTP\HTTPClient {
 
     /**
      * @inheritdoc
@@ -294,15 +294,15 @@ class HTTPClient extends \dokuwiki\HTTPClient\HTTPClient {
      */
     public function __construct()
     {
-        DebugHelper::dbgDeprecatedFunction(dokuwiki\HTTPClient\HTTPClient::class);
+        DebugHelper::dbgDeprecatedFunction(dokuwiki\HTTP\HTTPClient::class);
         parent::__construct();
     }
 }
 
 /**
- * @deprecated since 2019-03-17 use \dokuwiki\HTTPClient\DokuHTTPClient instead!
+ * @deprecated since 2019-03-17 use \dokuwiki\HTTP\DokuHTTPClient instead!
  */
-class DokuHTTPClient extends \dokuwiki\HTTPClient\DokuHTTPClient {
+class DokuHTTPClient extends \dokuwiki\HTTP\DokuHTTPClient {
 
     /**
      * @inheritdoc
@@ -310,7 +310,7 @@ class DokuHTTPClient extends \dokuwiki\HTTPClient\DokuHTTPClient {
      */
     public function __construct()
     {
-        DebugHelper::dbgDeprecatedFunction(dokuwiki\HTTPClient\DokuHTTPClient::class);
+        DebugHelper::dbgDeprecatedFunction(dokuwiki\HTTP\DokuHTTPClient::class);
         parent::__construct();
     }
 
diff --git a/inc/infoutils.php b/inc/infoutils.php
index 90b509197..ff2945a20 100644
--- a/inc/infoutils.php
+++ b/inc/infoutils.php
@@ -6,7 +6,7 @@
  * @author     Andreas Gohr <andi@splitbrain.org>
  */
 
-use dokuwiki\HTTPClient\DokuHTTPClient;
+use dokuwiki\HTTP\DokuHTTPClient;
 
 if(!defined('DOKU_MESSAGEURL')){
     if(in_array('ssl', stream_get_transports())) {
diff --git a/inc/io.php b/inc/io.php
index a9c2885e6..596908a9c 100644
--- a/inc/io.php
+++ b/inc/io.php
@@ -6,7 +6,7 @@
  * @author     Andreas Gohr <andi@splitbrain.org>
  */
 
-use dokuwiki\HTTPClient\DokuHTTPClient;
+use dokuwiki\HTTP\DokuHTTPClient;
 
 /**
  * Removes empty directories
diff --git a/inc/media.php b/inc/media.php
index fc52eae77..31292452d 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -7,7 +7,7 @@
  */
 
 use dokuwiki\ChangeLog\MediaChangeLog;
-use dokuwiki\HTTPClient\DokuHTTPClient;
+use dokuwiki\HTTP\DokuHTTPClient;
 
 /**
  * Lists pages which currently use a media file selected for deletion
diff --git a/lib/plugins/extension/helper/extension.php b/lib/plugins/extension/helper/extension.php
index 872356d24..3b9db5fae 100644
--- a/lib/plugins/extension/helper/extension.php
+++ b/lib/plugins/extension/helper/extension.php
@@ -6,7 +6,7 @@
  * @author  Michael Hamann <michael@content-space.de>
  */
 
-use dokuwiki\HTTPClient\DokuHTTPClient;
+use dokuwiki\HTTP\DokuHTTPClient;
 
 /**
  * Class helper_plugin_extension_extension represents a single extension (plugin or template)
diff --git a/lib/plugins/extension/helper/repository.php b/lib/plugins/extension/helper/repository.php
index 6ec09a02e..99d091045 100644
--- a/lib/plugins/extension/helper/repository.php
+++ b/lib/plugins/extension/helper/repository.php
@@ -7,7 +7,7 @@
  */
 
 use dokuwiki\Cache\Cache;
-use dokuwiki\HTTPClient\DokuHTTPClient;
+use dokuwiki\HTTP\DokuHTTPClient;
 
 /**
  * Class helper_plugin_extension_repository provides access to the extension repository on dokuwiki.org
diff --git a/lib/plugins/popularity/helper.php b/lib/plugins/popularity/helper.php
index 9326a5f83..50da6d535 100644
--- a/lib/plugins/popularity/helper.php
+++ b/lib/plugins/popularity/helper.php
@@ -1,6 +1,6 @@
 <?php
 
-use dokuwiki\HTTPClient\DokuHTTPClient;
+use dokuwiki\HTTP\DokuHTTPClient;
 
 /**
  * Popularity Feedback Plugin