diff --git a/lib/remote/actionshandler.cpp b/lib/remote/actionshandler.cpp
index b9853945b..0a23a3068 100644
--- a/lib/remote/actionshandler.cpp
+++ b/lib/remote/actionshandler.cpp
@@ -17,8 +17,8 @@ REGISTER_URLHANDLER("/v1/actions", ActionsHandler);
 
 bool ActionsHandler::HandleRequest(
 	const WaitGroup::Ptr& waitGroup,
-	const HttpRequest& request,
-	HttpResponse& response,
+	const HttpApiRequest& request,
+	HttpApiResponse& response,
 	boost::asio::yield_context& yc
 )
 {
diff --git a/lib/remote/actionshandler.hpp b/lib/remote/actionshandler.hpp
index 3ba856f69..2abe755e3 100644
--- a/lib/remote/actionshandler.hpp
+++ b/lib/remote/actionshandler.hpp
@@ -17,8 +17,8 @@ public:
 
 	bool HandleRequest(
 		const WaitGroup::Ptr& waitGroup,
-		const HttpRequest& request,
-		HttpResponse& response,
+		const HttpApiRequest& request,
+		HttpApiResponse& response,
 		boost::asio::yield_context& yc
 	) override;
 };
diff --git a/lib/remote/configfileshandler.cpp b/lib/remote/configfileshandler.cpp
index 2bd540386..48be8d0db 100644
--- a/lib/remote/configfileshandler.cpp
+++ b/lib/remote/configfileshandler.cpp
@@ -15,8 +15,8 @@ REGISTER_URLHANDLER("/v1/config/files", ConfigFilesHandler);
 
 bool ConfigFilesHandler::HandleRequest(
 	const WaitGroup::Ptr&,
-	const HttpRequest& request,
-	HttpResponse& response,
+	const HttpApiRequest& request,
+	HttpApiResponse& response,
 	boost::asio::yield_context& yc
 )
 {
diff --git a/lib/remote/configfileshandler.hpp b/lib/remote/configfileshandler.hpp
index 3294811c0..43f1512c0 100644
--- a/lib/remote/configfileshandler.hpp
+++ b/lib/remote/configfileshandler.hpp
@@ -15,8 +15,8 @@ public:
 
 	bool HandleRequest(
 		const WaitGroup::Ptr& waitGroup,
-		const HttpRequest& request,
-		HttpResponse& response,
+		const HttpApiRequest& request,
+		HttpApiResponse& response,
 		boost::asio::yield_context& yc
 	) override;
 };
diff --git a/lib/remote/configpackageshandler.cpp b/lib/remote/configpackageshandler.cpp
index 7e0c7b02c..4a88ef9f8 100644
--- a/lib/remote/configpackageshandler.cpp
+++ b/lib/remote/configpackageshandler.cpp
@@ -13,8 +13,8 @@ REGISTER_URLHANDLER("/v1/config/packages", ConfigPackagesHandler);
 
 bool ConfigPackagesHandler::HandleRequest(
 	const WaitGroup::Ptr&,
-	const HttpRequest& request,
-	HttpResponse& response,
+	const HttpApiRequest& request,
+	HttpApiResponse& response,
 	boost::asio::yield_context& yc
 )
 {
@@ -39,7 +39,7 @@ bool ConfigPackagesHandler::HandleRequest(
 	return true;
 }
 
-void ConfigPackagesHandler::HandleGet(const HttpRequest& request, HttpResponse& response)
+void ConfigPackagesHandler::HandleGet(const HttpApiRequest& request, HttpApiResponse& response)
 {
 	namespace http = boost::beast::http;
 
@@ -87,7 +87,7 @@ void ConfigPackagesHandler::HandleGet(const HttpRequest& request, HttpResponse&
 	HttpUtility::SendJsonBody(response, params, result);
 }
 
-void ConfigPackagesHandler::HandlePost(const HttpRequest& request, HttpResponse& response)
+void ConfigPackagesHandler::HandlePost(const HttpApiRequest& request, HttpApiResponse& response)
 {
 	namespace http = boost::beast::http;
 
@@ -137,7 +137,7 @@ void ConfigPackagesHandler::HandlePost(const HttpRequest& request, HttpResponse&
 	HttpUtility::SendJsonBody(response, params, result);
 }
 
-void ConfigPackagesHandler::HandleDelete(const HttpRequest& request, HttpResponse& response)
+void ConfigPackagesHandler::HandleDelete(const HttpApiRequest& request, HttpApiResponse& response)
 {
 	namespace http = boost::beast::http;
 
diff --git a/lib/remote/configpackageshandler.hpp b/lib/remote/configpackageshandler.hpp
index 172690f63..5abe6f0ee 100644
--- a/lib/remote/configpackageshandler.hpp
+++ b/lib/remote/configpackageshandler.hpp
@@ -15,15 +15,15 @@ public:
 
 	bool HandleRequest(
 		const WaitGroup::Ptr& waitGroup,
-		const HttpRequest& request,
-		HttpResponse& response,
+		const HttpApiRequest& request,
+		HttpApiResponse& response,
 		boost::asio::yield_context& yc
 	) override;
 
 private:
-	void HandleGet(const HttpRequest& request, HttpResponse& response);
-	void HandlePost(const HttpRequest& request, HttpResponse& response);
-	void HandleDelete(const HttpRequest& request, HttpResponse& response);
+	void HandleGet(const HttpApiRequest& request, HttpApiResponse& response);
+	void HandlePost(const HttpApiRequest& request, HttpApiResponse& response);
+	void HandleDelete(const HttpApiRequest& request, HttpApiResponse& response);
 
 };
 
diff --git a/lib/remote/configstageshandler.cpp b/lib/remote/configstageshandler.cpp
index b08270e56..09a4ed3c8 100644
--- a/lib/remote/configstageshandler.cpp
+++ b/lib/remote/configstageshandler.cpp
@@ -20,8 +20,8 @@ static std::mutex l_RunningPackageUpdatesMutex; // Protects the above two variab
 
 bool ConfigStagesHandler::HandleRequest(
 	const WaitGroup::Ptr&,
-	const HttpRequest& request,
-	HttpResponse& response,
+	const HttpApiRequest& request,
+	HttpApiResponse& response,
 	boost::asio::yield_context& yc
 )
 {
@@ -46,7 +46,7 @@ bool ConfigStagesHandler::HandleRequest(
 	return true;
 }
 
-void ConfigStagesHandler::HandleGet(const HttpRequest& request, HttpResponse& response)
+void ConfigStagesHandler::HandleGet(const HttpApiRequest& request, HttpApiResponse& response)
 {
 	namespace http = boost::beast::http;
 
@@ -92,7 +92,7 @@ void ConfigStagesHandler::HandleGet(const HttpRequest& request, HttpResponse& re
 	HttpUtility::SendJsonBody(response, params, result);
 }
 
-void ConfigStagesHandler::HandlePost(const HttpRequest& request, HttpResponse& response)
+void ConfigStagesHandler::HandlePost(const HttpApiRequest& request, HttpApiResponse& response)
 {
 	namespace http = boost::beast::http;
 
@@ -203,7 +203,7 @@ void ConfigStagesHandler::HandlePost(const HttpRequest& request, HttpResponse& r
 	HttpUtility::SendJsonBody(response, params, result);
 }
 
-void ConfigStagesHandler::HandleDelete(const HttpRequest& request, HttpResponse& response)
+void ConfigStagesHandler::HandleDelete(const HttpApiRequest& request, HttpApiResponse& response)
 {
 	namespace http = boost::beast::http;
 
diff --git a/lib/remote/configstageshandler.hpp b/lib/remote/configstageshandler.hpp
index ec333cc50..8bedce5aa 100644
--- a/lib/remote/configstageshandler.hpp
+++ b/lib/remote/configstageshandler.hpp
@@ -15,15 +15,15 @@ public:
 
 	bool HandleRequest(
 		const WaitGroup::Ptr& waitGroup,
-		const HttpRequest& request,
-		HttpResponse& response,
+		const HttpApiRequest& request,
+		HttpApiResponse& response,
 		boost::asio::yield_context& yc
 	) override;
 
 private:
-	void HandleGet(const HttpRequest& request, HttpResponse& response);
-	void HandlePost(const HttpRequest& request, HttpResponse& response);
-	void HandleDelete(const HttpRequest& request, HttpResponse& response);
+	void HandleGet(const HttpApiRequest& request, HttpApiResponse& response);
+	void HandlePost(const HttpApiRequest& request, HttpApiResponse& response);
+	void HandleDelete(const HttpApiRequest& request, HttpApiResponse& response);
 };
 
 }
diff --git a/lib/remote/consolehandler.cpp b/lib/remote/consolehandler.cpp
index 5184638d4..22bbe5911 100644
--- a/lib/remote/consolehandler.cpp
+++ b/lib/remote/consolehandler.cpp
@@ -54,8 +54,8 @@ static void EnsureFrameCleanupTimer()
 
 bool ConsoleHandler::HandleRequest(
 	const WaitGroup::Ptr&,
-	const HttpRequest& request,
-	HttpResponse& response,
+	const HttpApiRequest& request,
+	HttpApiResponse& response,
 	boost::asio::yield_context& yc
 )
 {
@@ -102,7 +102,7 @@ bool ConsoleHandler::HandleRequest(
 	return true;
 }
 
-bool ConsoleHandler::ExecuteScriptHelper(const HttpRequest& request, HttpResponse& response,
+bool ConsoleHandler::ExecuteScriptHelper(const HttpApiRequest& request, HttpApiResponse& response,
 	const String& command, const String& session, bool sandboxed)
 {
 	namespace http = boost::beast::http;
@@ -176,7 +176,7 @@ bool ConsoleHandler::ExecuteScriptHelper(const HttpRequest& request, HttpRespons
 	return true;
 }
 
-bool ConsoleHandler::AutocompleteScriptHelper(const HttpRequest& request, HttpResponse& response,
+bool ConsoleHandler::AutocompleteScriptHelper(const HttpApiRequest& request, HttpApiResponse& response,
 	const String& command, const String& session, bool sandboxed)
 {
 	namespace http = boost::beast::http;
diff --git a/lib/remote/consolehandler.hpp b/lib/remote/consolehandler.hpp
index 30fb98f2e..90f1263dc 100644
--- a/lib/remote/consolehandler.hpp
+++ b/lib/remote/consolehandler.hpp
@@ -24,17 +24,17 @@ public:
 
 	bool HandleRequest(
 		const WaitGroup::Ptr& waitGroup,
-		const HttpRequest& request,
-		HttpResponse& response,
+		const HttpApiRequest& request,
+		HttpApiResponse& response,
 		boost::asio::yield_context& yc
 	) override;
 
 	static std::vector<String> GetAutocompletionSuggestions(const String& word, ScriptFrame& frame);
 
 private:
-	static bool ExecuteScriptHelper(const HttpRequest& request, HttpResponse& response,
+	static bool ExecuteScriptHelper(const HttpApiRequest& request, HttpApiResponse& response,
 		const String& command, const String& session, bool sandboxed);
-	static bool AutocompleteScriptHelper(const HttpRequest& request, HttpResponse& response,
+	static bool AutocompleteScriptHelper(const HttpApiRequest& request, HttpApiResponse& response,
 		const String& command, const String& session, bool sandboxed);
 
 };
diff --git a/lib/remote/createobjecthandler.cpp b/lib/remote/createobjecthandler.cpp
index beff9c987..b002d1cf7 100644
--- a/lib/remote/createobjecthandler.cpp
+++ b/lib/remote/createobjecthandler.cpp
@@ -17,8 +17,8 @@ REGISTER_URLHANDLER("/v1/objects", CreateObjectHandler);
 
 bool CreateObjectHandler::HandleRequest(
 	const WaitGroup::Ptr& waitGroup,
-	const HttpRequest& request,
-	HttpResponse& response,
+	const HttpApiRequest& request,
+	HttpApiResponse& response,
 	boost::asio::yield_context& yc
 )
 {
diff --git a/lib/remote/createobjecthandler.hpp b/lib/remote/createobjecthandler.hpp
index 972d7b3bd..2d71c424f 100644
--- a/lib/remote/createobjecthandler.hpp
+++ b/lib/remote/createobjecthandler.hpp
@@ -15,8 +15,8 @@ public:
 
 	bool HandleRequest(
 		const WaitGroup::Ptr& waitGroup,
-		const HttpRequest& request,
-		HttpResponse& response,
+		const HttpApiRequest& request,
+		HttpApiResponse& response,
 		boost::asio::yield_context& yc
 	) override;
 };
diff --git a/lib/remote/deleteobjecthandler.cpp b/lib/remote/deleteobjecthandler.cpp
index cd99f7b28..652a66b4b 100644
--- a/lib/remote/deleteobjecthandler.cpp
+++ b/lib/remote/deleteobjecthandler.cpp
@@ -17,8 +17,8 @@ REGISTER_URLHANDLER("/v1/objects", DeleteObjectHandler);
 
 bool DeleteObjectHandler::HandleRequest(
 	const WaitGroup::Ptr& waitGroup,
-	const HttpRequest& request,
-	HttpResponse& response,
+	const HttpApiRequest& request,
+	HttpApiResponse& response,
 	boost::asio::yield_context& yc
 )
 {
diff --git a/lib/remote/deleteobjecthandler.hpp b/lib/remote/deleteobjecthandler.hpp
index f969facda..e63bac6f6 100644
--- a/lib/remote/deleteobjecthandler.hpp
+++ b/lib/remote/deleteobjecthandler.hpp
@@ -15,8 +15,8 @@ public:
 
 	bool HandleRequest(
 		const WaitGroup::Ptr& waitGroup,
-		const HttpRequest& request,
-		HttpResponse& response,
+		const HttpApiRequest& request,
+		HttpApiResponse& response,
 		boost::asio::yield_context& yc
 	) override;
 };
diff --git a/lib/remote/eventshandler.cpp b/lib/remote/eventshandler.cpp
index b4eaf70f3..79a63b24f 100644
--- a/lib/remote/eventshandler.cpp
+++ b/lib/remote/eventshandler.cpp
@@ -41,8 +41,8 @@ const String l_ApiQuery ("<API query>");
 
 bool EventsHandler::HandleRequest(
 	const WaitGroup::Ptr&,
-	const HttpRequest& request,
-	HttpResponse& response,
+	const HttpApiRequest& request,
+	HttpApiResponse& response,
 	boost::asio::yield_context& yc
 )
 {
diff --git a/lib/remote/eventshandler.hpp b/lib/remote/eventshandler.hpp
index 91d5ffe3f..006be673d 100644
--- a/lib/remote/eventshandler.hpp
+++ b/lib/remote/eventshandler.hpp
@@ -16,8 +16,8 @@ public:
 
 	bool HandleRequest(
 		const WaitGroup::Ptr& waitGroup,
-		const HttpRequest& request,
-		HttpResponse& response,
+		const HttpApiRequest& request,
+		HttpApiResponse& response,
 		boost::asio::yield_context& yc
 	) override;
 };
diff --git a/lib/remote/httphandler.cpp b/lib/remote/httphandler.cpp
index db27da31a..0dafad4c8 100644
--- a/lib/remote/httphandler.cpp
+++ b/lib/remote/httphandler.cpp
@@ -48,8 +48,8 @@ void HttpHandler::Register(const Url::Ptr& url, const HttpHandler::Ptr& handler)
 
 void HttpHandler::ProcessRequest(
 	const WaitGroup::Ptr& waitGroup,
-	HttpRequest& request,
-	HttpResponse& response,
+	HttpApiRequest& request,
+	HttpApiResponse& response,
 	boost::asio::yield_context& yc
 )
 {
diff --git a/lib/remote/httphandler.hpp b/lib/remote/httphandler.hpp
index 77f7d4337..4e714fd43 100644
--- a/lib/remote/httphandler.hpp
+++ b/lib/remote/httphandler.hpp
@@ -30,16 +30,16 @@ public:
 
 	virtual bool HandleRequest(
 		const WaitGroup::Ptr& waitGroup,
-		const HttpRequest& request,
-		HttpResponse& response,
+		const HttpApiRequest& request,
+		HttpApiResponse& response,
 		boost::asio::yield_context& yc
 	) = 0;
 
 	static void Register(const Url::Ptr& url, const HttpHandler::Ptr& handler);
 	static void ProcessRequest(
 		const WaitGroup::Ptr& waitGroup,
-		HttpRequest& request,
-		HttpResponse& response,
+		HttpApiRequest& request,
+		HttpApiResponse& response,
 		boost::asio::yield_context& yc
 	);
 
diff --git a/lib/remote/httpmessage.cpp b/lib/remote/httpmessage.cpp
index 18e5a3016..6ad761b8a 100644
--- a/lib/remote/httpmessage.cpp
+++ b/lib/remote/httpmessage.cpp
@@ -30,7 +30,7 @@ constexpr std::size_t l_FlushThreshold = 128UL * 1024UL;
 class HttpResponseJsonWriter : public AsyncJsonWriter
 {
 public:
-	explicit HttpResponseJsonWriter(HttpResponse& msg) : m_Message{msg}
+	explicit HttpResponseJsonWriter(HttpApiResponse& msg) : m_Message{msg}
 	{
 		m_Message.body().Start();
 #if BOOST_VERSION >= 107000
@@ -59,51 +59,51 @@ public:
 	}
 
 private:
-	HttpResponse& m_Message;
+	HttpApiResponse& m_Message;
 };
 
-HttpRequest::HttpRequest(Shared<AsioTlsStream>::Ptr stream) : m_Stream(std::move(stream))
+HttpApiRequest::HttpApiRequest(Shared<AsioTlsStream>::Ptr stream) : m_Stream(std::move(stream))
 {
 }
 
-void HttpRequest::ParseHeader(boost::beast::flat_buffer& buf, boost::asio::yield_context yc)
+void HttpApiRequest::ParseHeader(boost::beast::flat_buffer& buf, boost::asio::yield_context yc)
 {
 	boost::beast::http::async_read_header(*m_Stream, buf, m_Parser, yc);
 	base() = m_Parser.get().base();
 }
 
-void HttpRequest::ParseBody(boost::beast::flat_buffer& buf, boost::asio::yield_context yc)
+void HttpApiRequest::ParseBody(boost::beast::flat_buffer& buf, boost::asio::yield_context yc)
 {
 	boost::beast::http::async_read(*m_Stream, buf, m_Parser, yc);
 	body() = std::move(m_Parser.release().body());
 }
 
-ApiUser::Ptr HttpRequest::User() const
+ApiUser::Ptr HttpApiRequest::User() const
 {
 	return m_User;
 }
 
-void HttpRequest::User(const ApiUser::Ptr& user)
+void HttpApiRequest::User(const ApiUser::Ptr& user)
 {
 	m_User = user;
 }
 
-Url::Ptr HttpRequest::Url() const
+Url::Ptr HttpApiRequest::Url() const
 {
 	return m_Url;
 }
 
-void HttpRequest::DecodeUrl()
+void HttpApiRequest::DecodeUrl()
 {
 	m_Url = new icinga::Url(std::string(target()));
 }
 
-Dictionary::Ptr HttpRequest::Params() const
+Dictionary::Ptr HttpApiRequest::Params() const
 {
 	return m_Params;
 }
 
-void HttpRequest::DecodeParams()
+void HttpApiRequest::DecodeParams()
 {
 	if (!m_Url) {
 		DecodeUrl();
@@ -111,18 +111,18 @@ void HttpRequest::DecodeParams()
 	m_Params = HttpUtility::FetchRequestParameters(m_Url, body());
 }
 
-HttpResponse::HttpResponse(Shared<AsioTlsStream>::Ptr stream, HttpServerConnection::Ptr server)
+HttpApiResponse::HttpApiResponse(Shared<AsioTlsStream>::Ptr stream, HttpServerConnection::Ptr server)
 	: m_Server(std::move(server)), m_Stream(std::move(stream))
 {
 }
 
-void HttpResponse::Clear()
+void HttpApiResponse::Clear()
 {
 	ASSERT(!m_SerializationStarted);
 	boost::beast::http::response<body_type>::operator=({});
 }
 
-void HttpResponse::Flush(boost::asio::yield_context yc)
+void HttpApiResponse::Flush(boost::asio::yield_context yc)
 {
 	if (!chunked() && !has_content_length()) {
 		ASSERT(!m_SerializationStarted);
@@ -149,7 +149,7 @@ void HttpResponse::Flush(boost::asio::yield_context yc)
 	ASSERT(m_Serializer.is_done() || !body().Finished());
 }
 
-void HttpResponse::StartStreaming(bool checkForDisconnect)
+void HttpApiResponse::StartStreaming(bool checkForDisconnect)
 {
 	ASSERT(body().Size() == 0 && !m_SerializationStarted);
 	body().Start();
@@ -161,13 +161,13 @@ void HttpResponse::StartStreaming(bool checkForDisconnect)
 	}
 }
 
-bool HttpResponse::IsClientDisconnected() const
+bool HttpApiResponse::IsClientDisconnected() const
 {
 	ASSERT(m_Server);
 	return m_Server->Disconnected();
 }
 
-void HttpResponse::SendFile(const String& path, const boost::asio::yield_context& yc)
+void HttpApiResponse::SendFile(const String& path, const boost::asio::yield_context& yc)
 {
 	std::ifstream fp(path.CStr(), std::ifstream::in | std::ifstream::binary | std::ifstream::ate);
 	fp.exceptions(std::ifstream::badbit | std::ifstream::eofbit);
@@ -190,7 +190,7 @@ void HttpResponse::SendFile(const String& path, const boost::asio::yield_context
 	}
 }
 
-JsonEncoder HttpResponse::GetJsonEncoder(bool pretty)
+JsonEncoder HttpApiResponse::GetJsonEncoder(bool pretty)
 {
 	return JsonEncoder{std::make_shared<HttpResponseJsonWriter>(*this), pretty};
 }
diff --git a/lib/remote/httpmessage.hpp b/lib/remote/httpmessage.hpp
index 10d00fd49..ef0f70bed 100644
--- a/lib/remote/httpmessage.hpp
+++ b/lib/remote/httpmessage.hpp
@@ -148,12 +148,12 @@ struct SerializableBody
  *
  * @ingroup remote
  */
-class HttpRequest : public boost::beast::http::request<boost::beast::http::string_body>
+class HttpApiRequest : public boost::beast::http::request<boost::beast::http::string_body>
 {
 public:
 	using ParserType = boost::beast::http::request_parser<body_type>;
 
-	explicit HttpRequest(Shared<AsioTlsStream>::Ptr stream);
+	explicit HttpApiRequest(Shared<AsioTlsStream>::Ptr stream);
 
 	/**
 	 * Parse the header of the response using the internal parser object.
@@ -200,10 +200,10 @@ private:
  *
  * @ingroup remote
  */
-class HttpResponse : public boost::beast::http::response<SerializableBody<boost::beast::multi_buffer>>
+class HttpApiResponse : public boost::beast::http::response<SerializableBody<boost::beast::multi_buffer>>
 {
 public:
-	explicit HttpResponse(Shared<AsioTlsStream>::Ptr stream, HttpServerConnection::Ptr server = nullptr);
+	explicit HttpApiResponse(Shared<AsioTlsStream>::Ptr stream, HttpServerConnection::Ptr server = nullptr);
 
 	/* Delete the base class clear() which is inherited from the fields<> class and doesn't
 	 * clear things like the body or obviously our own members.
@@ -270,7 +270,7 @@ public:
 	JsonEncoder GetJsonEncoder(bool pretty = false);
 
 private:
-	using Serializer = boost::beast::http::response_serializer<HttpResponse::body_type>;
+	using Serializer = boost::beast::http::response_serializer<HttpApiResponse::body_type>;
 	Serializer m_Serializer{*this};
 	bool m_SerializationStarted = false;
 
diff --git a/lib/remote/httpserverconnection.cpp b/lib/remote/httpserverconnection.cpp
index 6ae147452..c8af94a1c 100644
--- a/lib/remote/httpserverconnection.cpp
+++ b/lib/remote/httpserverconnection.cpp
@@ -122,7 +122,7 @@ void HttpServerConnection::StartDetectClientSideShutdown()
 	 * If this async_fill() then buffers more application data and not an immediate eof, we could
 	 * attempt to read another message before disconnecting.
 	 *
-	 * This could either be done at the level of the handlers, via the @c HttpResponse class, or
+	 * This could either be done at the level of the handlers, via the @c HttpApiResponse class, or
 	 * generally as a separate coroutine here in @c HttpServerConnection, both (mostly) side-effect
 	 * free and without affecting the state of the connection.
 	 *
@@ -159,8 +159,8 @@ void HttpServerConnection::SetLivenessTimeout(std::chrono::milliseconds timeout)
 static inline
 bool EnsureValidHeaders(
 	boost::beast::flat_buffer& buf,
-	HttpRequest& request,
-	HttpResponse& response,
+	HttpApiRequest& request,
+	HttpApiResponse& response,
 	bool& shuttingDown,
 	boost::asio::yield_context& yc
 )
@@ -216,14 +216,14 @@ bool EnsureValidHeaders(
 static inline
 void HandleExpect100(
 	const Shared<AsioTlsStream>::Ptr& stream,
-	const HttpRequest& request,
+	const HttpApiRequest& request,
 	boost::asio::yield_context& yc
 )
 {
 	namespace http = boost::beast::http;
 
 	if (request[http::field::expect] == "100-continue") {
-		HttpResponse response{stream};
+		HttpApiResponse response{stream};
 		response.result(http::status::continue_);
 		response.Flush(yc);
 	}
@@ -231,8 +231,8 @@ void HandleExpect100(
 
 static inline
 bool HandleAccessControl(
-	const HttpRequest& request,
-	HttpResponse& response,
+	const HttpApiRequest& request,
+	HttpApiResponse& response,
 	boost::asio::yield_context& yc
 )
 {
@@ -275,8 +275,8 @@ bool HandleAccessControl(
 
 static inline
 bool EnsureAcceptHeader(
-	const HttpRequest& request,
-	HttpResponse& response,
+	const HttpApiRequest& request,
+	HttpApiResponse& response,
 	boost::asio::yield_context& yc
 )
 {
@@ -298,8 +298,8 @@ bool EnsureAcceptHeader(
 
 static inline
 bool EnsureAuthenticatedUser(
-	const HttpRequest& request,
-	HttpResponse& response,
+	const HttpApiRequest& request,
+	HttpApiResponse& response,
 	boost::asio::yield_context& yc
 )
 {
@@ -331,8 +331,8 @@ bool EnsureAuthenticatedUser(
 static inline
 bool EnsureValidBody(
 	boost::beast::flat_buffer& buf,
-	HttpRequest& request,
-	HttpResponse& response,
+	HttpApiRequest& request,
+	HttpApiResponse& response,
 	bool& shuttingDown,
 	boost::asio::yield_context& yc
 )
@@ -413,8 +413,8 @@ bool EnsureValidBody(
 
 static inline
 void ProcessRequest(
-	HttpRequest& request,
-	HttpResponse& response,
+	HttpApiRequest& request,
+	HttpApiResponse& response,
 	const WaitGroup::Ptr& waitGroup,
 	std::chrono::steady_clock::duration& cpuBoundWorkTime,
 	boost::asio::yield_context& yc
@@ -459,8 +459,8 @@ void HttpServerConnection::ProcessMessages(boost::asio::yield_context yc)
 		while (m_WaitGroup->IsLockable()) {
 			m_Seen = ch::steady_clock::now();
 
-			HttpRequest request(m_Stream);
-			HttpResponse response(m_Stream, this);
+			HttpApiRequest request(m_Stream);
+			HttpApiResponse response(m_Stream, this);
 
 			request.Parser().header_limit(1024 * 1024);
 			request.Parser().body_limit(-1);
diff --git a/lib/remote/httputility.cpp b/lib/remote/httputility.cpp
index fbf95f2a9..15286fd5b 100644
--- a/lib/remote/httputility.cpp
+++ b/lib/remote/httputility.cpp
@@ -52,7 +52,7 @@ Value HttpUtility::GetLastParameter(const Dictionary::Ptr& params, const String&
 		return arr->Get(arr->GetLength() - 1);
 }
 
-void HttpUtility::SendJsonBody(HttpResponse& response, const Dictionary::Ptr& params, const Value& val)
+void HttpUtility::SendJsonBody(HttpApiResponse& response, const Dictionary::Ptr& params, const Value& val)
 {
 	namespace http = boost::beast::http;
 
@@ -60,7 +60,7 @@ void HttpUtility::SendJsonBody(HttpResponse& response, const Dictionary::Ptr& pa
 	response.GetJsonEncoder(params && GetLastParameter(params, "pretty")).Encode(val);
 }
 
-void HttpUtility::SendJsonError(HttpResponse& response,
+void HttpUtility::SendJsonError(HttpApiResponse& response,
 	const Dictionary::Ptr& params, int code, const String& info, const String& diagnosticInformation)
 {
 	Dictionary::Ptr result = new Dictionary({ { "error", code } });
diff --git a/lib/remote/httputility.hpp b/lib/remote/httputility.hpp
index 6ad1720ea..76147aa4c 100644
--- a/lib/remote/httputility.hpp
+++ b/lib/remote/httputility.hpp
@@ -23,8 +23,8 @@ public:
 	static Dictionary::Ptr FetchRequestParameters(const Url::Ptr& url, const std::string& body);
 	static Value GetLastParameter(const Dictionary::Ptr& params, const String& key);
 
-	static void SendJsonBody(HttpResponse& response, const Dictionary::Ptr& params, const Value& val);
-	static void SendJsonError(HttpResponse& response, const Dictionary::Ptr& params, const int code,
+	static void SendJsonBody(HttpApiResponse& response, const Dictionary::Ptr& params, const Value& val);
+	static void SendJsonError(HttpApiResponse& response, const Dictionary::Ptr& params, const int code,
 		const String& info = {}, const String& diagnosticInformation = {});
 
 	static bool IsValidHeaderName(std::string_view name);
diff --git a/lib/remote/infohandler.cpp b/lib/remote/infohandler.cpp
index 52d7c4b26..893705b1a 100644
--- a/lib/remote/infohandler.cpp
+++ b/lib/remote/infohandler.cpp
@@ -10,8 +10,8 @@ REGISTER_URLHANDLER("/", InfoHandler);
 
 bool InfoHandler::HandleRequest(
 	const WaitGroup::Ptr&,
-	const HttpRequest& request,
-	HttpResponse& response,
+	const HttpApiRequest& request,
+	HttpApiResponse& response,
 	boost::asio::yield_context& yc
 )
 {
diff --git a/lib/remote/infohandler.hpp b/lib/remote/infohandler.hpp
index e62a497ff..e061179ff 100644
--- a/lib/remote/infohandler.hpp
+++ b/lib/remote/infohandler.hpp
@@ -15,8 +15,8 @@ public:
 
 	bool HandleRequest(
 		const WaitGroup::Ptr& waitGroup,
-		const HttpRequest& request,
-		HttpResponse& response,
+		const HttpApiRequest& request,
+		HttpApiResponse& response,
 		boost::asio::yield_context& yc
 	) override;
 };
diff --git a/lib/remote/mallocinfohandler.cpp b/lib/remote/mallocinfohandler.cpp
index 4ca37d555..f8351d54f 100644
--- a/lib/remote/mallocinfohandler.cpp
+++ b/lib/remote/mallocinfohandler.cpp
@@ -19,8 +19,8 @@ REGISTER_URLHANDLER("/v1/debug/malloc_info", MallocInfoHandler);
 
 bool MallocInfoHandler::HandleRequest(
 	const WaitGroup::Ptr&,
-	const HttpRequest& request,
-	HttpResponse& response,
+	const HttpApiRequest& request,
+	HttpApiResponse& response,
 	boost::asio::yield_context&
 )
 {
diff --git a/lib/remote/mallocinfohandler.hpp b/lib/remote/mallocinfohandler.hpp
index 10d8b162f..c14ab7776 100644
--- a/lib/remote/mallocinfohandler.hpp
+++ b/lib/remote/mallocinfohandler.hpp
@@ -14,8 +14,8 @@ public:
 
 	bool HandleRequest(
 		const WaitGroup::Ptr& waitGroup,
-		const HttpRequest& request,
-		HttpResponse& response,
+		const HttpApiRequest& request,
+		HttpApiResponse& response,
 		boost::asio::yield_context& yc
 	) override;
 };
diff --git a/lib/remote/modifyobjecthandler.cpp b/lib/remote/modifyobjecthandler.cpp
index 9264e3c64..71f6e068b 100644
--- a/lib/remote/modifyobjecthandler.cpp
+++ b/lib/remote/modifyobjecthandler.cpp
@@ -15,8 +15,8 @@ REGISTER_URLHANDLER("/v1/objects", ModifyObjectHandler);
 
 bool ModifyObjectHandler::HandleRequest(
 	const WaitGroup::Ptr& waitGroup,
-	const HttpRequest& request,
-	HttpResponse& response,
+	const HttpApiRequest& request,
+	HttpApiResponse& response,
 	boost::asio::yield_context& yc
 )
 {
diff --git a/lib/remote/modifyobjecthandler.hpp b/lib/remote/modifyobjecthandler.hpp
index abc7f9735..c59509cc9 100644
--- a/lib/remote/modifyobjecthandler.hpp
+++ b/lib/remote/modifyobjecthandler.hpp
@@ -15,8 +15,8 @@ public:
 
 	bool HandleRequest(
 		const WaitGroup::Ptr& waitGroup,
-		const HttpRequest& request,
-		HttpResponse& response,
+		const HttpApiRequest& request,
+		HttpApiResponse& response,
 		boost::asio::yield_context& yc
 	) override;
 };
diff --git a/lib/remote/objectqueryhandler.cpp b/lib/remote/objectqueryhandler.cpp
index 4384abb55..10757aa1e 100644
--- a/lib/remote/objectqueryhandler.cpp
+++ b/lib/remote/objectqueryhandler.cpp
@@ -93,8 +93,8 @@ Dictionary::Ptr ObjectQueryHandler::SerializeObjectAttrs(const Object::Ptr& obje
 
 bool ObjectQueryHandler::HandleRequest(
 	const WaitGroup::Ptr&,
-	const HttpRequest& request,
-	HttpResponse& response,
+	const HttpApiRequest& request,
+	HttpApiResponse& response,
 	boost::asio::yield_context& yc
 )
 {
diff --git a/lib/remote/objectqueryhandler.hpp b/lib/remote/objectqueryhandler.hpp
index 1c7d25afd..9a341c644 100644
--- a/lib/remote/objectqueryhandler.hpp
+++ b/lib/remote/objectqueryhandler.hpp
@@ -15,8 +15,8 @@ public:
 
 	bool HandleRequest(
 		const WaitGroup::Ptr& waitGroup,
-		const HttpRequest& request,
-		HttpResponse& response,
+		const HttpApiRequest& request,
+		HttpApiResponse& response,
 		boost::asio::yield_context& yc
 	) override;
 
diff --git a/lib/remote/statushandler.cpp b/lib/remote/statushandler.cpp
index 8a16ad81e..b11ff616f 100644
--- a/lib/remote/statushandler.cpp
+++ b/lib/remote/statushandler.cpp
@@ -70,8 +70,8 @@ public:
 
 bool StatusHandler::HandleRequest(
 	const WaitGroup::Ptr&,
-	const HttpRequest& request,
-	HttpResponse& response,
+	const HttpApiRequest& request,
+	HttpApiResponse& response,
 	boost::asio::yield_context& yc
 )
 {
diff --git a/lib/remote/statushandler.hpp b/lib/remote/statushandler.hpp
index dceb58ac2..6b18564f0 100644
--- a/lib/remote/statushandler.hpp
+++ b/lib/remote/statushandler.hpp
@@ -15,8 +15,8 @@ public:
 
 	bool HandleRequest(
 		const WaitGroup::Ptr& waitGroup,
-		const HttpRequest& request,
-		HttpResponse& response,
+		const HttpApiRequest& request,
+		HttpApiResponse& response,
 		boost::asio::yield_context& yc
 	) override;
 };
diff --git a/lib/remote/templatequeryhandler.cpp b/lib/remote/templatequeryhandler.cpp
index 81261f02d..c2fe11f72 100644
--- a/lib/remote/templatequeryhandler.cpp
+++ b/lib/remote/templatequeryhandler.cpp
@@ -77,8 +77,8 @@ public:
 
 bool TemplateQueryHandler::HandleRequest(
 	const WaitGroup::Ptr&,
-	const HttpRequest& request,
-	HttpResponse& response,
+	const HttpApiRequest& request,
+	HttpApiResponse& response,
 	boost::asio::yield_context& yc
 )
 {
diff --git a/lib/remote/templatequeryhandler.hpp b/lib/remote/templatequeryhandler.hpp
index 3b3b58cc4..9372f0168 100644
--- a/lib/remote/templatequeryhandler.hpp
+++ b/lib/remote/templatequeryhandler.hpp
@@ -15,8 +15,8 @@ public:
 
 	bool HandleRequest(
 		const WaitGroup::Ptr& waitGroup,
-		const HttpRequest& request,
-		HttpResponse& response,
+		const HttpApiRequest& request,
+		HttpApiResponse& response,
 		boost::asio::yield_context& yc
 	) override;
 };
diff --git a/lib/remote/typequeryhandler.cpp b/lib/remote/typequeryhandler.cpp
index dda19cd12..d303e5c5d 100644
--- a/lib/remote/typequeryhandler.cpp
+++ b/lib/remote/typequeryhandler.cpp
@@ -48,8 +48,8 @@ public:
 
 bool TypeQueryHandler::HandleRequest(
 	const WaitGroup::Ptr&,
-	const HttpRequest& request,
-	HttpResponse& response,
+	const HttpApiRequest& request,
+	HttpApiResponse& response,
 	boost::asio::yield_context& yc
 )
 {
diff --git a/lib/remote/typequeryhandler.hpp b/lib/remote/typequeryhandler.hpp
index f065d2471..0e1a9aedb 100644
--- a/lib/remote/typequeryhandler.hpp
+++ b/lib/remote/typequeryhandler.hpp
@@ -15,8 +15,8 @@ public:
 
 	bool HandleRequest(
 		const WaitGroup::Ptr& waitGroup,
-		const HttpRequest& request,
-		HttpResponse& response,
+		const HttpApiRequest& request,
+		HttpApiResponse& response,
 		boost::asio::yield_context& yc
 	) override;
 };
diff --git a/lib/remote/variablequeryhandler.cpp b/lib/remote/variablequeryhandler.cpp
index b67fe906f..b0bfc51de 100644
--- a/lib/remote/variablequeryhandler.cpp
+++ b/lib/remote/variablequeryhandler.cpp
@@ -60,8 +60,8 @@ public:
 
 bool VariableQueryHandler::HandleRequest(
 	const WaitGroup::Ptr&,
-	const HttpRequest& request,
-	HttpResponse& response,
+	const HttpApiRequest& request,
+	HttpApiResponse& response,
 	boost::asio::yield_context& yc
 )
 {
diff --git a/lib/remote/variablequeryhandler.hpp b/lib/remote/variablequeryhandler.hpp
index b6706037e..ef745d4c0 100644
--- a/lib/remote/variablequeryhandler.hpp
+++ b/lib/remote/variablequeryhandler.hpp
@@ -15,8 +15,8 @@ public:
 
 	bool HandleRequest(
 		const WaitGroup::Ptr& waitGroup,
-		const HttpRequest& request,
-		HttpResponse& response,
+		const HttpApiRequest& request,
+		HttpApiResponse& response,
 		boost::asio::yield_context& yc
 	) override;
 };
diff --git a/test/remote-httpmessage.cpp b/test/remote-httpmessage.cpp
index 30adb44e3..96a43a357 100644
--- a/test/remote-httpmessage.cpp
+++ b/test/remote-httpmessage.cpp
@@ -49,7 +49,7 @@ BOOST_AUTO_TEST_CASE(request_parse)
 
 	auto future = SpawnSynchronizedCoroutine([this, &requestOut](boost::asio::yield_context yc) {
 		boost::beast::flat_buffer buf;
-		HttpRequest request(server);
+		HttpApiRequest request(server);
 		BOOST_REQUIRE_NO_THROW(request.ParseHeader(buf, yc));
 
 		for (const auto& field : requestOut.base()) {
@@ -71,7 +71,7 @@ BOOST_AUTO_TEST_CASE(request_parse)
 
 BOOST_AUTO_TEST_CASE(request_params)
 {
-	HttpRequest request(client);
+	HttpApiRequest request(client);
 	// clang-format off
 	request.body() = JsonEncode(
 		new Dictionary{
@@ -119,7 +119,7 @@ BOOST_AUTO_TEST_CASE(request_params)
 
 BOOST_AUTO_TEST_CASE(response_clear)
 {
-	HttpResponse response(server);
+	HttpApiResponse response(server);
 	response.result(http::status::bad_request);
 	response.version(10);
 	response.set(http::field::content_type, "text/html");
@@ -136,7 +136,7 @@ BOOST_AUTO_TEST_CASE(response_clear)
 BOOST_AUTO_TEST_CASE(response_flush_nothrow)
 {
 	auto future = SpawnSynchronizedCoroutine([this](const boost::asio::yield_context& yc) {
-		HttpResponse response(server);
+		HttpApiResponse response(server);
 		response.result(http::status::ok);
 
 		server->lowest_layer().close();
@@ -153,7 +153,7 @@ BOOST_AUTO_TEST_CASE(response_flush_nothrow)
 BOOST_AUTO_TEST_CASE(response_flush_throw)
 {
 	auto future = SpawnSynchronizedCoroutine([this](const boost::asio::yield_context& yc) {
-		HttpResponse response(server);
+		HttpApiResponse response(server);
 		response.result(http::status::ok);
 
 		server->lowest_layer().close();
@@ -171,7 +171,7 @@ BOOST_AUTO_TEST_CASE(response_flush_throw)
 BOOST_AUTO_TEST_CASE(response_write_empty)
 {
 	auto future = SpawnSynchronizedCoroutine([this](boost::asio::yield_context yc) {
-		HttpResponse response(server);
+		HttpApiResponse response(server);
 		response.result(http::status::ok);
 
 		BOOST_REQUIRE_NO_THROW(response.Flush(yc));
@@ -197,7 +197,7 @@ BOOST_AUTO_TEST_CASE(response_write_empty)
 BOOST_AUTO_TEST_CASE(response_write_fixed)
 {
 	auto future = SpawnSynchronizedCoroutine([this](boost::asio::yield_context yc) {
-		HttpResponse response(server);
+		HttpApiResponse response(server);
 		response.result(http::status::ok);
 		response.body() << "test";
 
@@ -225,7 +225,7 @@ BOOST_AUTO_TEST_CASE(response_write_chunked)
 {
 	// NOLINTNEXTLINE(readability-function-cognitive-complexity)
 	auto future = SpawnSynchronizedCoroutine([this](boost::asio::yield_context yc) {
-		HttpResponse response(server);
+		HttpApiResponse response(server);
 		response.result(http::status::ok);
 
 		response.StartStreaming();
@@ -263,7 +263,7 @@ BOOST_AUTO_TEST_CASE(response_write_chunked)
 BOOST_AUTO_TEST_CASE(response_sendjsonbody)
 {
 	auto future = SpawnSynchronizedCoroutine([this](boost::asio::yield_context yc) {
-		HttpResponse response(server);
+		HttpApiResponse response(server);
 		response.result(http::status::ok);
 
 		HttpUtility::SendJsonBody(response, nullptr, new Dictionary{{"test", 1}});
@@ -292,7 +292,7 @@ BOOST_AUTO_TEST_CASE(response_sendjsonbody)
 BOOST_AUTO_TEST_CASE(response_sendjsonerror)
 {
 	auto future = SpawnSynchronizedCoroutine([this](boost::asio::yield_context yc) {
-		HttpResponse response(server);
+		HttpApiResponse response(server);
 
 		// This has to be overwritten in SendJsonError.
 		response.result(http::status::ok);
@@ -324,7 +324,7 @@ BOOST_AUTO_TEST_CASE(response_sendjsonerror)
 BOOST_AUTO_TEST_CASE(response_sendfile)
 {
 	auto future = SpawnSynchronizedCoroutine([this](boost::asio::yield_context yc) {
-		HttpResponse response(server);
+		HttpApiResponse response(server);
 
 		response.result(http::status::ok);
 		BOOST_REQUIRE_NO_THROW(response.SendFile(m_CaCrtFile.string(), yc));
diff --git a/test/remote-httpserverconnection.cpp b/test/remote-httpserverconnection.cpp
index a2cb9ff2a..4a37f0ec0 100644
--- a/test/remote-httpserverconnection.cpp
+++ b/test/remote-httpserverconnection.cpp
@@ -67,12 +67,12 @@ struct HttpServerConnectionFixture : TlsStreamFixture, ConfigurationCacheDirFixt
 class UnitTestHandler final : public HttpHandler
 {
 public:
-	using TestFn = std::function<void(HttpResponse& response, const boost::asio::yield_context&)>;
+	using TestFn = std::function<void(HttpApiResponse& response, const boost::asio::yield_context&)>;
 
 	static void RegisterTestFn(std::string handle, TestFn fn) { testFns[std::move(handle)] = std::move(fn); }
 
 private:
-	bool HandleRequest(const WaitGroup::Ptr&, const HttpRequest& request, HttpResponse& response,
+	bool HandleRequest(const WaitGroup::Ptr&, const HttpApiRequest& request, HttpApiResponse& response,
 		boost::asio::yield_context& yc) override
 	{
 		response.result(boost::beast::http::status::ok);
@@ -381,7 +381,7 @@ BOOST_AUTO_TEST_CASE(wg_abort)
 	CreateTestUsers();
 	SetupHttpServerConnection(true);
 
-	UnitTestHandler::RegisterTestFn("wgjoin", [this](HttpResponse& response, const boost::asio::yield_context&) {
+	UnitTestHandler::RegisterTestFn("wgjoin", [this](HttpApiResponse& response, const boost::asio::yield_context&) {
 		response.body() << "test";
 		m_WaitGroup->Join();
 	});
@@ -421,7 +421,7 @@ BOOST_AUTO_TEST_CASE(client_shutdown)
 	CreateTestUsers();
 	SetupHttpServerConnection(true);
 
-	UnitTestHandler::RegisterTestFn("stream", [](HttpResponse& response, const boost::asio::yield_context& yc) {
+	UnitTestHandler::RegisterTestFn("stream", [](HttpApiResponse& response, const boost::asio::yield_context& yc) {
 		response.StartStreaming();
 		response.Flush(yc);
 
@@ -470,7 +470,7 @@ BOOST_AUTO_TEST_CASE(handler_throw_error)
 	CreateTestUsers();
 	SetupHttpServerConnection(true);
 
-	UnitTestHandler::RegisterTestFn("throw", [](HttpResponse& response, const boost::asio::yield_context&) {
+	UnitTestHandler::RegisterTestFn("throw", [](HttpApiResponse& response, const boost::asio::yield_context&) {
 		response.StartStreaming();
 		response.body() << "test";
 
@@ -508,7 +508,7 @@ BOOST_AUTO_TEST_CASE(handler_throw_streaming)
 	CreateTestUsers();
 	SetupHttpServerConnection(true);
 
-	UnitTestHandler::RegisterTestFn("throw", [](HttpResponse& response, const boost::asio::yield_context& yc) {
+	UnitTestHandler::RegisterTestFn("throw", [](HttpApiResponse& response, const boost::asio::yield_context& yc) {
 		response.StartStreaming();
 		response.body() << "test";