diff --git a/loolwsd/ChildSession.cpp b/loolwsd/ChildSession.cpp
index a61224654..0c1d0014e 100644
--- a/loolwsd/ChildSession.cpp
+++ b/loolwsd/ChildSession.cpp
@@ -63,7 +63,7 @@ public:
 class CallbackWorker: public Runnable
 {
 public:
-    CallbackWorker(NotificationQueue& queue, ChildProcessSession& session):
+    CallbackWorker(NotificationQueue& queue, ChildSession& session):
         _queue(queue),
         _session(session),
         _stop(false)
@@ -280,13 +280,13 @@ public:
 
 private:
     NotificationQueue& _queue;
-    ChildProcessSession& _session;
+    ChildSession& _session;
     volatile bool _stop;
 };
 
-std::recursive_mutex ChildProcessSession::Mutex;
+std::recursive_mutex ChildSession::Mutex;
 
-ChildProcessSession::ChildProcessSession(const std::string& id,
+ChildSession::ChildSession(const std::string& id,
                                          std::shared_ptr<WebSocket> ws,
                                          LibreOfficeKitDocument * loKitDocument,
                                          const std::string& jailId,
@@ -301,14 +301,14 @@ ChildProcessSession::ChildProcessSession(const std::string& id,
     _onUnload(onUnload),
     _callbackWorker(new CallbackWorker(_callbackQueue, *this))
 {
-    Log::info("ChildProcessSession ctor [" + getName() + "].");
+    Log::info("ChildSession ctor [" + getName() + "].");
 
     _callbackThread.start(*_callbackWorker);
 }
 
-ChildProcessSession::~ChildProcessSession()
+ChildSession::~ChildSession()
 {
-    Log::info("~ChildProcessSession dtor [" + getName() + "].");
+    Log::info("~ChildSession dtor [" + getName() + "].");
 
     disconnect();
 
@@ -317,7 +317,7 @@ ChildProcessSession::~ChildProcessSession()
     _callbackThread.join();
 }
 
-void ChildProcessSession::disconnect()
+void ChildSession::disconnect()
 {
     if (!isDisconnected())
     {
@@ -332,7 +332,7 @@ void ChildProcessSession::disconnect()
     }
 }
 
-bool ChildProcessSession::_handleInput(const char *buffer, int length)
+bool ChildSession::_handleInput(const char *buffer, int length)
 {
     const std::string firstLine = getFirstLine(buffer, length);
     StringTokenizer tokens(firstLine, " ", StringTokenizer::TOK_IGNORE_EMPTY | StringTokenizer::TOK_TRIM);
@@ -569,7 +569,7 @@ bool ChildProcessSession::_handleInput(const char *buffer, int length)
     return true;
 }
 
-bool ChildProcessSession::loadDocument(const char * /*buffer*/, int /*length*/, StringTokenizer& tokens)
+bool ChildSession::loadDocument(const char * /*buffer*/, int /*length*/, StringTokenizer& tokens)
 {
     int part = -1;
     if (tokens.count() < 2)
@@ -623,7 +623,7 @@ bool ChildProcessSession::loadDocument(const char * /*buffer*/, int /*length*/,
     return true;
 }
 
-void ChildProcessSession::sendFontRendering(const char* /*buffer*/, int /*length*/, StringTokenizer& tokens)
+void ChildSession::sendFontRendering(const char* /*buffer*/, int /*length*/, StringTokenizer& tokens)
 {
     std::string font, decodedFont;
 
@@ -665,7 +665,7 @@ void ChildProcessSession::sendFontRendering(const char* /*buffer*/, int /*length
     sendBinaryFrame(output.data(), output.size());
 }
 
-bool ChildProcessSession::getStatus(const char* /*buffer*/, int /*length*/)
+bool ChildSession::getStatus(const char* /*buffer*/, int /*length*/)
 {
     std::unique_lock<std::recursive_mutex> lock(Mutex);
 
@@ -683,7 +683,7 @@ bool ChildProcessSession::getStatus(const char* /*buffer*/, int /*length*/)
     return true;
 }
 
-bool ChildProcessSession::getCommandValues(const char* /*buffer*/, int /*length*/, StringTokenizer& tokens)
+bool ChildSession::getCommandValues(const char* /*buffer*/, int /*length*/, StringTokenizer& tokens)
 {
     std::string command;
     if (tokens.count() != 2 || !getTokenString(tokens[1], "command", command))
@@ -701,7 +701,7 @@ bool ChildProcessSession::getCommandValues(const char* /*buffer*/, int /*length*
     return true;
 }
 
-bool ChildProcessSession::getPartPageRectangles(const char* /*buffer*/, int /*length*/)
+bool ChildSession::getPartPageRectangles(const char* /*buffer*/, int /*length*/)
 {
     std::unique_lock<std::recursive_mutex> lock(Mutex);
 
@@ -712,7 +712,7 @@ bool ChildProcessSession::getPartPageRectangles(const char* /*buffer*/, int /*le
     return true;
 }
 
-bool ChildProcessSession::clientZoom(const char* /*buffer*/, int /*length*/, StringTokenizer& tokens)
+bool ChildSession::clientZoom(const char* /*buffer*/, int /*length*/, StringTokenizer& tokens)
 {
     int tilePixelWidth, tilePixelHeight, tileTwipWidth, tileTwipHeight;
 
@@ -735,7 +735,7 @@ bool ChildProcessSession::clientZoom(const char* /*buffer*/, int /*length*/, Str
     return true;
 }
 
-bool ChildProcessSession::clientVisibleArea(const char* /*buffer*/, int /*length*/, StringTokenizer& tokens)
+bool ChildSession::clientVisibleArea(const char* /*buffer*/, int /*length*/, StringTokenizer& tokens)
 {
     int x;
     int y;
@@ -761,7 +761,7 @@ bool ChildProcessSession::clientVisibleArea(const char* /*buffer*/, int /*length
     return true;
 }
 
-bool ChildProcessSession::downloadAs(const char* /*buffer*/, int /*length*/, StringTokenizer& tokens)
+bool ChildSession::downloadAs(const char* /*buffer*/, int /*length*/, StringTokenizer& tokens)
 {
     std::string name, id, format, filterOptions;
 
@@ -798,13 +798,13 @@ bool ChildProcessSession::downloadAs(const char* /*buffer*/, int /*length*/, Str
     return true;
 }
 
-bool ChildProcessSession::getChildId()
+bool ChildSession::getChildId()
 {
     sendTextFrame("getchildid: id=" + _jailId);
     return true;
 }
 
-bool ChildProcessSession::getTextSelection(const char* /*buffer*/, int /*length*/, StringTokenizer& tokens)
+bool ChildSession::getTextSelection(const char* /*buffer*/, int /*length*/, StringTokenizer& tokens)
 {
     std::string mimeType;
 
@@ -828,7 +828,7 @@ bool ChildProcessSession::getTextSelection(const char* /*buffer*/, int /*length*
     return true;
 }
 
-bool ChildProcessSession::paste(const char* buffer, int length, StringTokenizer& tokens)
+bool ChildSession::paste(const char* buffer, int length, StringTokenizer& tokens)
 {
     std::string mimeType;
 
@@ -854,7 +854,7 @@ bool ChildProcessSession::paste(const char* buffer, int length, StringTokenizer&
     return true;
 }
 
-bool ChildProcessSession::insertFile(const char* /*buffer*/, int /*length*/, StringTokenizer& tokens)
+bool ChildSession::insertFile(const char* /*buffer*/, int /*length*/, StringTokenizer& tokens)
 {
     std::string name, type;
 
@@ -886,7 +886,7 @@ bool ChildProcessSession::insertFile(const char* /*buffer*/, int /*length*/, Str
     return true;
 }
 
-bool ChildProcessSession::keyEvent(const char* /*buffer*/, int /*length*/, StringTokenizer& tokens)
+bool ChildSession::keyEvent(const char* /*buffer*/, int /*length*/, StringTokenizer& tokens)
 {
     int type, charcode, keycode;
 
@@ -927,7 +927,7 @@ bool ChildProcessSession::keyEvent(const char* /*buffer*/, int /*length*/, Strin
     return true;
 }
 
-bool ChildProcessSession::mouseEvent(const char* /*buffer*/, int /*length*/, StringTokenizer& tokens)
+bool ChildSession::mouseEvent(const char* /*buffer*/, int /*length*/, StringTokenizer& tokens)
 {
     int type, x, y, count;
     bool success = true;
@@ -973,7 +973,7 @@ bool ChildProcessSession::mouseEvent(const char* /*buffer*/, int /*length*/, Str
     return true;
 }
 
-bool ChildProcessSession::unoCommand(const char* /*buffer*/, int /*length*/, StringTokenizer& tokens)
+bool ChildSession::unoCommand(const char* /*buffer*/, int /*length*/, StringTokenizer& tokens)
 {
     if (tokens.count() == 1)
     {
@@ -1003,7 +1003,7 @@ bool ChildProcessSession::unoCommand(const char* /*buffer*/, int /*length*/, Str
     return true;
 }
 
-bool ChildProcessSession::selectText(const char* /*buffer*/, int /*length*/, StringTokenizer& tokens)
+bool ChildSession::selectText(const char* /*buffer*/, int /*length*/, StringTokenizer& tokens)
 {
     int type, x, y;
 
@@ -1030,7 +1030,7 @@ bool ChildProcessSession::selectText(const char* /*buffer*/, int /*length*/, Str
     return true;
 }
 
-bool ChildProcessSession::selectGraphic(const char* /*buffer*/, int /*length*/, StringTokenizer& tokens)
+bool ChildSession::selectGraphic(const char* /*buffer*/, int /*length*/, StringTokenizer& tokens)
 {
     int type, x, y;
 
@@ -1056,7 +1056,7 @@ bool ChildProcessSession::selectGraphic(const char* /*buffer*/, int /*length*/,
     return true;
 }
 
-bool ChildProcessSession::resetSelection(const char* /*buffer*/, int /*length*/, StringTokenizer& tokens)
+bool ChildSession::resetSelection(const char* /*buffer*/, int /*length*/, StringTokenizer& tokens)
 {
     if (tokens.count() != 1)
     {
@@ -1074,7 +1074,7 @@ bool ChildProcessSession::resetSelection(const char* /*buffer*/, int /*length*/,
     return true;
 }
 
-bool ChildProcessSession::saveAs(const char* /*buffer*/, int /*length*/, StringTokenizer& tokens)
+bool ChildSession::saveAs(const char* /*buffer*/, int /*length*/, StringTokenizer& tokens)
 {
     std::string url, format, filterOptions;
 
@@ -1113,7 +1113,7 @@ bool ChildProcessSession::saveAs(const char* /*buffer*/, int /*length*/, StringT
     return true;
 }
 
-bool ChildProcessSession::setClientPart(const char* /*buffer*/, int /*length*/, StringTokenizer& tokens)
+bool ChildSession::setClientPart(const char* /*buffer*/, int /*length*/, StringTokenizer& tokens)
 {
     int part;
     if (tokens.count() < 2 ||
@@ -1136,7 +1136,7 @@ bool ChildProcessSession::setClientPart(const char* /*buffer*/, int /*length*/,
     return true;
 }
 
-bool ChildProcessSession::setPage(const char* /*buffer*/, int /*length*/, StringTokenizer& tokens)
+bool ChildSession::setPage(const char* /*buffer*/, int /*length*/, StringTokenizer& tokens)
 {
     int page;
     if (tokens.count() < 2 ||
@@ -1155,7 +1155,7 @@ bool ChildProcessSession::setPage(const char* /*buffer*/, int /*length*/, String
     return true;
 }
 
-void ChildProcessSession::loKitCallback(const int nType, const char *pPayload)
+void ChildSession::loKitCallback(const int nType, const char *pPayload)
 {
     auto pNotif = new CallbackNotification(nType, pPayload ? pPayload : "(nil)");
     _callbackQueue.enqueueNotification(pNotif);
diff --git a/loolwsd/ChildSession.hpp b/loolwsd/ChildSession.hpp
index 2f06374f9..e55a490ec 100644
--- a/loolwsd/ChildSession.hpp
+++ b/loolwsd/ChildSession.hpp
@@ -26,23 +26,23 @@ class CallbackWorker;
 typedef std::function<LibreOfficeKitDocument*(const std::string&, const std::string&, const std::string&, const std::string&, bool)> OnLoadCallback;
 typedef std::function<void(const std::string&)> OnUnloadCallback;
 
-class ChildProcessSession final : public LOOLSession
+class ChildSession final : public LOOLSession
 {
 public:
-    /// Create a new ChildProcessSession
+    /// Create a new ChildSession
     /// ws The socket between master and kit (jailed).
     /// loKit The LOKit instance.
     /// loKitDocument The instance to an existing document (when opening
     ///                 a new view) or nullptr (when first view).
     /// jailId The JailID of the jail root directory,
     //         used by downloadas to construct jailed path.
-    ChildProcessSession(const std::string& id,
+    ChildSession(const std::string& id,
                         std::shared_ptr<Poco::Net::WebSocket> ws,
                         LibreOfficeKitDocument * loKitDocument,
                         const std::string& jailId,
                         OnLoadCallback onLoad,
                         OnUnloadCallback onUnload);
-    virtual ~ChildProcessSession();
+    virtual ~ChildSession();
 
     bool getStatus(const char *buffer, int length);
     bool getPartPageRectangles(const char *buffer, int length);
diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index 6f1329889..901551800 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -222,7 +222,7 @@ namespace
 class Connection: public Runnable
 {
 public:
-    Connection(std::shared_ptr<ChildProcessSession> session,
+    Connection(std::shared_ptr<ChildSession> session,
                std::shared_ptr<WebSocket> ws) :
         _session(session),
         _ws(ws),
@@ -240,7 +240,7 @@ public:
     }
 
     std::shared_ptr<WebSocket> getWebSocket() const { return _ws; }
-    std::shared_ptr<ChildProcessSession> getSession() { return _session; }
+    std::shared_ptr<ChildSession> getSession() { return _session; }
 
     void start()
     {
@@ -281,7 +281,7 @@ public:
 
             Thread queueHandlerThread;
             queueHandlerThread.start(handler);
-            std::shared_ptr<ChildProcessSession> session = _session;
+            std::shared_ptr<ChildSession> session = _session;
 
             IoUtil::SocketProcessor(_ws,
                 [&queue](const std::vector<char>& payload)
@@ -327,7 +327,7 @@ public:
 
 private:
     Thread _thread;
-    std::shared_ptr<ChildProcessSession> _session;
+    std::shared_ptr<ChildSession> _session;
     std::shared_ptr<WebSocket> _ws;
     std::atomic<bool> _stop;
     std::mutex _threadMutex;
@@ -463,7 +463,7 @@ public:
             auto ws = std::make_shared<WebSocket>(cs, request, response);
             ws->setReceiveTimeout(0);
 
-            auto session = std::make_shared<ChildProcessSession>(sessionId, ws, _loKitDocument, _jailId,
+            auto session = std::make_shared<ChildSession>(sessionId, ws, _loKitDocument, _jailId,
                            [this](const std::string& id, const std::string& uri, const std::string& docPassword,
                                   const std::string& renderOpts, bool haveDocPassword) { return onLoad(id, uri, docPassword, renderOpts, haveDocPassword); },
                            [this](const std::string& id) { onUnload(id); });
@@ -494,7 +494,7 @@ public:
     /// Returns -1 on failure.
     size_t purgeSessions()
     {
-        std::vector<std::shared_ptr<ChildProcessSession>> deadSessions;
+        std::vector<std::shared_ptr<ChildSession>> deadSessions;
         size_t num_connections = 0;
         {
             std::unique_lock<std::mutex> lock(_mutex, std::defer_lock);
@@ -616,7 +616,7 @@ public:
             ++index;
         }
 
-        std::unique_lock<std::recursive_mutex> lock(ChildProcessSession::getLock());
+        std::unique_lock<std::recursive_mutex> lock(ChildSession::getLock());
 
         if (_loKitDocument == nullptr)
         {