SERVER-35188 Rename ServiceLiason* types to ServiceLiaison*

(cherry picked from commit 359a685c7139f7767875519f185517306a1e37e8)

17 files changed, 96 insertions, 96 deletions

diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript
index 94e2182ce71..4f7b261f7bc 100644
--- a/src/mongo/db/SConscript
+++ b/src/mongo/db/SConscript
@@ -1160,9 +1160,9 @@ env.Library(
 )
 
 env.Library(
-    target='service_liason',
+    target='service_liaison',
     source=[
-        'service_liason.cpp',
+        'service_liaison.cpp',
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/crypto/sha1_block',
@@ -1190,28 +1190,28 @@ envWithAsio.CppUnitTest(
         'logical_session_cache_impl',
         'logical_session_id',
         'logical_session_id_helpers',
-        'service_liason_mock',
+        'service_liaison_mock',
         'sessions_collection_mock',
     ],
 )
 
 envWithAsio.Library(
-    target='service_liason_mock',
+    target='service_liaison_mock',
     source=[
-        'service_liason_mock.cpp',
+        'service_liaison_mock.cpp',
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/executor/async_timer_mock',
         '$BUILD_DIR/mongo/util/periodic_runner_factory',
         'kill_sessions',
-        'service_liason',
+        'service_liaison',
     ],
 )
 
 envWithAsio.Library(
-    target='service_liason_mongod',
+    target='service_liaison_mongod',
     source=[
-        'service_liason_mongod.cpp',
+        'service_liaison_mongod.cpp',
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/db/logical_session_id',
@@ -1219,14 +1219,14 @@ envWithAsio.Library(
         '$BUILD_DIR/mongo/util/periodic_runner',
         'query_exec',
         'service_context',
-        'service_liason',
+        'service_liaison',
     ],
 )
 
 env.Library(
-    target='service_liason_mongos',
+    target='service_liaison_mongos',
     source=[
-        'service_liason_mongos.cpp',
+        'service_liaison_mongos.cpp',
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/db/logical_session_id',
@@ -1235,7 +1235,7 @@ env.Library(
         '$BUILD_DIR/mongo/s/coreshard',
         '$BUILD_DIR/mongo/s/query/cluster_cursor_manager',
         'service_context',
-        'service_liason',
+        'service_liaison',
     ],
 )
 
@@ -1355,7 +1355,7 @@ env.Library(
         'logical_session_id_helpers',
         'sessions_collection',
         'server_parameters',
-        'service_liason',
+        'service_liaison',
         'kill_sessions',
     ],
     LIBDEPS_PRIVATE=[
@@ -1395,7 +1395,7 @@ envWithAsio.CppUnitTest(
         'logical_session_id_helpers',
         'logical_session_cache',
         'logical_session_cache_impl',
-        'service_liason_mock',
+        'service_liaison_mock',
         'sessions_collection_mock',
     ],
 )
@@ -1408,7 +1408,7 @@ envWithAsio.Library(
     LIBDEPS=[
         'logical_session_cache',
         'logical_session_cache_impl',
-        'service_liason_mongod',
+        'service_liaison_mongod',
         'sessions_collection_config_server',
         'sessions_collection_rs',
         'sessions_collection_sharded',
@@ -1427,7 +1427,7 @@ envWithAsio.Library(
     LIBDEPS=[
         'logical_session_cache',
         'logical_session_cache_impl',
-        'service_liason_mongos',
+        'service_liaison_mongos',
         'sessions_collection_sharded',
     ],
 )
diff --git a/src/mongo/db/logical_session_cache_factory_mongod.cpp b/src/mongo/db/logical_session_cache_factory_mongod.cpp
index 2672b41a4cc..d8d1e84c548 100644
--- a/src/mongo/db/logical_session_cache_factory_mongod.cpp
+++ b/src/mongo/db/logical_session_cache_factory_mongod.cpp
@@ -35,7 +35,7 @@
 #include "mongo/db/logical_session_cache_factory_mongod.h"
 
 #include "mongo/db/logical_session_cache_impl.h"
-#include "mongo/db/service_liason_mongod.h"
+#include "mongo/db/service_liaison_mongod.h"
 #include "mongo/db/sessions_collection_config_server.h"
 #include "mongo/db/sessions_collection_rs.h"
 #include "mongo/db/sessions_collection_sharded.h"
@@ -67,7 +67,7 @@ std::shared_ptr<SessionsCollection> makeSessionsCollection(LogicalSessionCacheSe
 
 std::unique_ptr<LogicalSessionCache> makeLogicalSessionCacheD(ServiceContext* svc,
                                                               LogicalSessionCacheServer state) {
-    auto liason = stdx::make_unique<ServiceLiasonMongod>();
+    auto liaison = stdx::make_unique<ServiceLiaisonMongod>();
 
     // Set up the logical session cache
     auto sessionsColl = makeSessionsCollection(state);
@@ -83,7 +83,7 @@ std::unique_ptr<LogicalSessionCache> makeLogicalSessionCacheD(ServiceContext* sv
         }
     }();
 
-    return stdx::make_unique<LogicalSessionCacheImpl>(std::move(liason),
+    return stdx::make_unique<LogicalSessionCacheImpl>(std::move(liaison),
                                                       std::move(sessionsColl),
                                                       std::move(reaper),
                                                       LogicalSessionCacheImpl::Options{});
diff --git a/src/mongo/db/logical_session_cache_factory_mongod.h b/src/mongo/db/logical_session_cache_factory_mongod.h
index faee5c56a1a..7cf8e803036 100644
--- a/src/mongo/db/logical_session_cache_factory_mongod.h
+++ b/src/mongo/db/logical_session_cache_factory_mongod.h
@@ -31,7 +31,7 @@
 #include <memory>
 
 #include "mongo/db/logical_session_cache.h"
-#include "mongo/db/service_liason.h"
+#include "mongo/db/service_liaison.h"
 
 namespace mongo {
 
diff --git a/src/mongo/db/logical_session_cache_factory_mongos.cpp b/src/mongo/db/logical_session_cache_factory_mongos.cpp
index 9822ec00b93..6f6d702a229 100644
--- a/src/mongo/db/logical_session_cache_factory_mongos.cpp
+++ b/src/mongo/db/logical_session_cache_factory_mongos.cpp
@@ -34,18 +34,18 @@
 
 #include "mongo/db/logical_session_cache_impl.h"
 #include "mongo/db/server_parameters.h"
-#include "mongo/db/service_liason_mongos.h"
+#include "mongo/db/service_liaison_mongos.h"
 #include "mongo/db/sessions_collection_sharded.h"
 #include "mongo/stdx/memory.h"
 
 namespace mongo {
 
 std::unique_ptr<LogicalSessionCache> makeLogicalSessionCacheS() {
-    auto liason = stdx::make_unique<ServiceLiasonMongos>();
+    auto liaison = stdx::make_unique<ServiceLiaisonMongos>();
     auto sessionsColl = stdx::make_unique<SessionsCollectionSharded>();
 
     return stdx::make_unique<LogicalSessionCacheImpl>(
-        std::move(liason), std::move(sessionsColl), nullptr, LogicalSessionCacheImpl::Options{});
+        std::move(liaison), std::move(sessionsColl), nullptr, LogicalSessionCacheImpl::Options{});
 }
 
 }  // namespace mongo
diff --git a/src/mongo/db/logical_session_cache_factory_mongos.h b/src/mongo/db/logical_session_cache_factory_mongos.h
index f8d23412168..b8183725597 100644
--- a/src/mongo/db/logical_session_cache_factory_mongos.h
+++ b/src/mongo/db/logical_session_cache_factory_mongos.h
@@ -31,7 +31,7 @@
 #include <memory>
 
 #include "mongo/db/logical_session_cache.h"
-#include "mongo/db/service_liason.h"
+#include "mongo/db/service_liaison.h"
 
 namespace mongo {
 
diff --git a/src/mongo/db/logical_session_cache_impl.cpp b/src/mongo/db/logical_session_cache_impl.cpp
index fb91dfc6286..a6f1b2b7d45 100644
--- a/src/mongo/db/logical_session_cache_impl.cpp
+++ b/src/mongo/db/logical_session_cache_impl.cpp
@@ -55,7 +55,7 @@ MONGO_EXPORT_STARTUP_SERVER_PARAMETER(disableLogicalSessionCacheRefresh, bool, f
 constexpr Minutes LogicalSessionCacheImpl::kLogicalSessionDefaultRefresh;
 
 LogicalSessionCacheImpl::LogicalSessionCacheImpl(
-    std::unique_ptr<ServiceLiason> service,
+    std::unique_ptr<ServiceLiaison> service,
     std::shared_ptr<SessionsCollection> collection,
     std::shared_ptr<TransactionReaper> transactionReaper,
     Options options)
diff --git a/src/mongo/db/logical_session_cache_impl.h b/src/mongo/db/logical_session_cache_impl.h
index 445159cd4e1..399753e4cba 100644
--- a/src/mongo/db/logical_session_cache_impl.h
+++ b/src/mongo/db/logical_session_cache_impl.h
@@ -31,7 +31,7 @@
 #include "mongo/db/logical_session_cache.h"
 #include "mongo/db/logical_session_id.h"
 #include "mongo/db/refresh_sessions_gen.h"
-#include "mongo/db/service_liason.h"
+#include "mongo/db/service_liaison.h"
 #include "mongo/db/sessions_collection.h"
 #include "mongo/db/time_proof_service.h"
 #include "mongo/db/transaction_reaper.h"
@@ -50,7 +50,7 @@ extern int logicalSessionRefreshMinutes;
 /**
  * A thread-safe cache structure for logical session records.
  *
- * The cache takes ownership of the passed-in ServiceLiason and
+ * The cache takes ownership of the passed-in ServiceLiaison and
  * SessionsCollection helper types.
  */
 class LogicalSessionCacheImpl final : public LogicalSessionCache {
@@ -87,7 +87,7 @@ public:
     /**
      * Construct a new session cache.
      */
-    explicit LogicalSessionCacheImpl(std::unique_ptr<ServiceLiason> service,
+    explicit LogicalSessionCacheImpl(std::unique_ptr<ServiceLiaison> service,
                                      std::shared_ptr<SessionsCollection> collection,
                                      std::shared_ptr<TransactionReaper> transactionReaper,
                                      Options options = Options{});
@@ -155,7 +155,7 @@ private:
     // automatically by the background jobs.
     LogicalSessionCacheStats _stats;
 
-    std::unique_ptr<ServiceLiason> _service;
+    std::unique_ptr<ServiceLiaison> _service;
     std::shared_ptr<SessionsCollection> _sessionsColl;
 
     mutable stdx::mutex _reaperMutex;
diff --git a/src/mongo/db/logical_session_cache_test.cpp b/src/mongo/db/logical_session_cache_test.cpp
index 10dcc9d8e4a..98d3df0d000 100644
--- a/src/mongo/db/logical_session_cache_test.cpp
+++ b/src/mongo/db/logical_session_cache_test.cpp
@@ -41,7 +41,7 @@
 #include "mongo/db/logical_session_id_helpers.h"
 #include "mongo/db/operation_context_noop.h"
 #include "mongo/db/service_context_noop.h"
-#include "mongo/db/service_liason_mock.h"
+#include "mongo/db/service_liaison_mock.h"
 #include "mongo/db/sessions_collection_mock.h"
 #include "mongo/stdx/future.h"
 #include "mongo/stdx/memory.h"
@@ -59,13 +59,13 @@ using SessionList = std::list<LogicalSessionId>;
 using unittest::EnsureFCV;
 
 /**
- * Test fixture that sets up a session cache attached to a mock service liason
+ * Test fixture that sets up a session cache attached to a mock service liaison
  * and mock sessions collection implementation.
  */
 class LogicalSessionCacheTest : public unittest::Test {
 public:
     LogicalSessionCacheTest()
-        : _service(std::make_shared<MockServiceLiasonImpl>()),
+        : _service(std::make_shared<MockServiceLiaisonImpl>()),
           _sessions(std::make_shared<MockSessionsCollectionImpl>()) {}
 
     void setUp() override {
@@ -76,7 +76,7 @@ public:
         _client = client.get();
         Client::setCurrent(std::move(client));
 
-        auto mockService = stdx::make_unique<MockServiceLiason>(_service);
+        auto mockService = stdx::make_unique<MockServiceLiaison>(_service);
         auto mockSessions = stdx::make_unique<MockSessionsCollection>(_sessions);
         _cache = stdx::make_unique<LogicalSessionCacheImpl>(
             std::move(mockService), std::move(mockSessions), nullptr);
@@ -101,7 +101,7 @@ public:
         return _cache;
     }
 
-    std::shared_ptr<MockServiceLiasonImpl> service() {
+    std::shared_ptr<MockServiceLiaisonImpl> service() {
         return _service;
     }
 
@@ -129,7 +129,7 @@ private:
     ServiceContextNoop serviceContext;
     ServiceContext::UniqueOperationContext _opCtx;
 
-    std::shared_ptr<MockServiceLiasonImpl> _service;
+    std::shared_ptr<MockServiceLiaisonImpl> _service;
     std::shared_ptr<MockSessionsCollectionImpl> _sessions;
 
     std::unique_ptr<LogicalSessionCache> _cache;
diff --git a/src/mongo/db/logical_session_id_test.cpp b/src/mongo/db/logical_session_id_test.cpp
index e80ab1f38b3..96f2dd2ac51 100644
--- a/src/mongo/db/logical_session_id_test.cpp
+++ b/src/mongo/db/logical_session_id_test.cpp
@@ -52,7 +52,7 @@
 #include "mongo/db/logical_session_id_helpers.h"
 #include "mongo/db/operation_context_noop.h"
 #include "mongo/db/service_context_noop.h"
-#include "mongo/db/service_liason_mock.h"
+#include "mongo/db/service_liaison_mock.h"
 #include "mongo/db/sessions_collection_mock.h"
 #include "mongo/transport/session.h"
 #include "mongo/transport/transport_layer_mock.h"
@@ -98,13 +98,13 @@ public:
         AuthorizationSession::set(client.get(), std::move(localauthzSession));
         authzManager->setAuthEnabled(true);
 
-        auto localServiceLiason =
-            std::make_unique<MockServiceLiason>(std::make_shared<MockServiceLiasonImpl>());
+        auto localServiceLiaison =
+            std::make_unique<MockServiceLiaison>(std::make_shared<MockServiceLiaisonImpl>());
         auto localSessionsCollection = stdx::make_unique<MockSessionsCollection>(
             std::make_shared<MockSessionsCollectionImpl>());
 
         auto localLogicalSessionCache = std::make_unique<LogicalSessionCacheImpl>(
-            std::move(localServiceLiason), std::move(localSessionsCollection), nullptr);
+            std::move(localServiceLiaison), std::move(localSessionsCollection), nullptr);
 
         LogicalSessionCache::set(&serviceContext, std::move(localLogicalSessionCache));
     }
diff --git a/src/mongo/db/service_liason.cpp b/src/mongo/db/service_liaison.cpp
index ade0f4b65f6..6b38edf8d86 100644
--- a/src/mongo/db/service_liason.cpp
+++ b/src/mongo/db/service_liaison.cpp
@@ -28,13 +28,13 @@
 
 #include "mongo/platform/basic.h"
 
-#include "mongo/db/service_liason.h"
+#include "mongo/db/service_liaison.h"
 
 #include "mongo/db/logical_clock.h"
 #include "mongo/db/service_context.h"
 
 namespace mongo {
 
-ServiceLiason::~ServiceLiason() = default;
+ServiceLiaison::~ServiceLiaison() = default;
 
 }  // namespace mongo
diff --git a/src/mongo/db/service_liason.h b/src/mongo/db/service_liaison.h
index 2b250e6943b..795038dd0a4 100644
--- a/src/mongo/db/service_liason.h
+++ b/src/mongo/db/service_liaison.h
@@ -45,9 +45,9 @@ class ServiceContext;
  *
  * Mongod and mongos implement their own classes to fulfill this interface.
  */
-class ServiceLiason {
+class ServiceLiaison {
 public:
-    virtual ~ServiceLiason();
+    virtual ~ServiceLiaison();
 
     /**
      * Return a list of sessions that are currently being used to run operations
@@ -63,14 +63,14 @@ public:
     /**
      * Schedule a job to be run at regular intervals until the server shuts down.
      *
-     * The ServiceLiason should start its background runner on construction, and
+     * The ServiceLiaison should start its background runner on construction, and
      * should continue fielding job requests through scheduleJob until join() is
      * called.
      */
     virtual void scheduleJob(PeriodicRunner::PeriodicJob job) = 0;
 
     /**
-     * Stops the service liason from running any more jobs scheduled
+     * Stops the service liaison from running any more jobs scheduled
      * through scheduleJob. This method may block and wait for background threads to
      * join. Implementations should make it safe for this method to be called
      * multiple times, or concurrently by different threads.
diff --git a/src/mongo/db/service_liason_mock.cpp b/src/mongo/db/service_liaison_mock.cpp
index fbc09f88784..83a5fb46baa 100644
--- a/src/mongo/db/service_liason_mock.cpp
+++ b/src/mongo/db/service_liaison_mock.cpp
@@ -30,85 +30,85 @@
 
 #include <algorithm>
 
-#include "mongo/db/service_liason_mock.h"
+#include "mongo/db/service_liaison_mock.h"
 #include "mongo/stdx/memory.h"
 #include "mongo/util/periodic_runner_factory.h"
 
 namespace mongo {
 
-MockServiceLiasonImpl::MockServiceLiasonImpl() {
+MockServiceLiaisonImpl::MockServiceLiaisonImpl() {
     _timerFactory = stdx::make_unique<executor::AsyncTimerFactoryMock>();
     _runner = makePeriodicRunner(getGlobalServiceContext());
     _runner->startup();
 }
 
-LogicalSessionIdSet MockServiceLiasonImpl::getActiveOpSessions() const {
+LogicalSessionIdSet MockServiceLiaisonImpl::getActiveOpSessions() const {
     stdx::unique_lock<stdx::mutex> lk(_mutex);
     return _activeSessions;
 }
 
-LogicalSessionIdSet MockServiceLiasonImpl::getOpenCursorSessions() const {
+LogicalSessionIdSet MockServiceLiaisonImpl::getOpenCursorSessions() const {
     stdx::unique_lock<stdx::mutex> lk(_mutex);
     return _cursorSessions;
 }
 
-void MockServiceLiasonImpl::join() {
+void MockServiceLiaisonImpl::join() {
     _runner->shutdown();
 }
 
-Date_t MockServiceLiasonImpl::now() const {
+Date_t MockServiceLiaisonImpl::now() const {
     return _timerFactory->now();
 }
 
-void MockServiceLiasonImpl::scheduleJob(PeriodicRunner::PeriodicJob job) {
+void MockServiceLiaisonImpl::scheduleJob(PeriodicRunner::PeriodicJob job) {
     // The cache should be refreshed from tests by calling refreshNow().
     return;
 }
 
 
-void MockServiceLiasonImpl::addCursorSession(LogicalSessionId lsid) {
+void MockServiceLiaisonImpl::addCursorSession(LogicalSessionId lsid) {
     stdx::unique_lock<stdx::mutex> lk(_mutex);
     _cursorSessions.insert(std::move(lsid));
 }
 
-void MockServiceLiasonImpl::removeCursorSession(LogicalSessionId lsid) {
+void MockServiceLiaisonImpl::removeCursorSession(LogicalSessionId lsid) {
     stdx::unique_lock<stdx::mutex> lk(_mutex);
     _cursorSessions.erase(lsid);
 }
 
-void MockServiceLiasonImpl::clearCursorSession() {
+void MockServiceLiaisonImpl::clearCursorSession() {
     stdx::unique_lock<stdx::mutex> lk(_mutex);
     _cursorSessions.clear();
 }
 
-void MockServiceLiasonImpl::add(LogicalSessionId lsid) {
+void MockServiceLiaisonImpl::add(LogicalSessionId lsid) {
     stdx::unique_lock<stdx::mutex> lk(_mutex);
     _cursorSessions.insert(std::move(lsid));
 }
 
-void MockServiceLiasonImpl::remove(LogicalSessionId lsid) {
+void MockServiceLiaisonImpl::remove(LogicalSessionId lsid) {
     stdx::unique_lock<stdx::mutex> lk(_mutex);
     _activeSessions.erase(lsid);
 }
 
-void MockServiceLiasonImpl::clear() {
+void MockServiceLiaisonImpl::clear() {
     stdx::unique_lock<stdx::mutex> lk(_mutex);
     _activeSessions.clear();
 }
 
-void MockServiceLiasonImpl::fastForward(Milliseconds time) {
+void MockServiceLiaisonImpl::fastForward(Milliseconds time) {
     _timerFactory->fastForward(time);
 }
 
-int MockServiceLiasonImpl::jobs() {
+int MockServiceLiaisonImpl::jobs() {
     return _timerFactory->jobs();
 }
 
-const KillAllSessionsByPattern* MockServiceLiasonImpl::matchKilled(const LogicalSessionId& lsid) {
+const KillAllSessionsByPattern* MockServiceLiaisonImpl::matchKilled(const LogicalSessionId& lsid) {
     return _matcher->match(lsid);
 }
 
-std::pair<Status, int> MockServiceLiasonImpl::killCursorsWithMatchingSessions(
+std::pair<Status, int> MockServiceLiaisonImpl::killCursorsWithMatchingSessions(
     OperationContext* opCtx, const SessionKiller::Matcher& matcher) {
 
     _matcher = matcher;
diff --git a/src/mongo/db/service_liason_mock.h b/src/mongo/db/service_liaison_mock.h
index 66eea52d09f..26aaf611589 100644
--- a/src/mongo/db/service_liason_mock.h
+++ b/src/mongo/db/service_liaison_mock.h
@@ -30,7 +30,7 @@
 
 #include "mongo/db/service_context.h"
 #include "mongo/db/service_context_noop.h"
-#include "mongo/db/service_liason.h"
+#include "mongo/db/service_liaison.h"
 #include "mongo/executor/async_timer_mock.h"
 #include "mongo/platform/atomic_word.h"
 #include "mongo/stdx/condition_variable.h"
@@ -41,9 +41,9 @@
 namespace mongo {
 
 /**
- * To allow us to move a MockServiceLiason into the session cache while
- * maintaining a hold on it from within our unit tests, the MockServiceLiason
- * will have an internal pointer to a MockServiceLiasonImpl object that the
+ * To allow us to move a MockServiceLiaison into the session cache while
+ * maintaining a hold on it from within our unit tests, the MockServiceLiaison
+ * will have an internal pointer to a MockServiceLiaisonImpl object that the
  * test creates and controls.
  *
  * This class maintains an internal _activeSessions list that may be modified
@@ -52,13 +52,13 @@ namespace mongo {
  * be the epoch + the amount of minutes this object has been fast-forwarded over
  * course of its life.
  *
- * This service liason starts up its internal periodic runner on construction.
+ * This service liaison starts up its internal periodic runner on construction.
  */
-class MockServiceLiasonImpl {
+class MockServiceLiaisonImpl {
 public:
-    MockServiceLiasonImpl();
+    MockServiceLiaisonImpl();
 
-    // Forwarding methods from the MockServiceLiason
+    // Forwarding methods from the MockServiceLiaison
     LogicalSessionIdSet getActiveOpSessions() const;
     LogicalSessionIdSet getOpenCursorSessions() const;
     Date_t now() const;
@@ -93,11 +93,11 @@ private:
 };
 
 /**
- * A mock service liason for testing the logical session cache.
+ * A mock service liaison for testing the logical session cache.
  */
-class MockServiceLiason : public ServiceLiason {
+class MockServiceLiaison : public ServiceLiaison {
 public:
-    explicit MockServiceLiason(std::shared_ptr<MockServiceLiasonImpl> impl)
+    explicit MockServiceLiaison(std::shared_ptr<MockServiceLiaisonImpl> impl)
         : _impl(std::move(impl)) {}
 
     LogicalSessionIdSet getActiveOpSessions() const override {
@@ -131,7 +131,7 @@ protected:
     }
 
 private:
-    std::shared_ptr<MockServiceLiasonImpl> _impl;
+    std::shared_ptr<MockServiceLiaisonImpl> _impl;
     std::unique_ptr<ServiceContextNoop> _serviceContext;
 };
 
diff --git a/src/mongo/db/service_liason_mongod.cpp b/src/mongo/db/service_liaison_mongod.cpp
index 70e7ced614b..a6e91477f6c 100644
--- a/src/mongo/db/service_liason_mongod.cpp
+++ b/src/mongo/db/service_liaison_mongod.cpp
@@ -28,7 +28,7 @@
 
 #include "mongo/platform/basic.h"
 
-#include "mongo/db/service_liason_mongod.h"
+#include "mongo/db/service_liaison_mongod.h"
 
 #include "mongo/db/client.h"
 #include "mongo/db/cursor_manager.h"
@@ -40,7 +40,7 @@
 
 namespace mongo {
 
-LogicalSessionIdSet ServiceLiasonMongod::getActiveOpSessions() const {
+LogicalSessionIdSet ServiceLiaisonMongod::getActiveOpSessions() const {
     LogicalSessionIdSet activeSessions;
 
     invariant(hasGlobalServiceContext());
@@ -65,7 +65,7 @@ LogicalSessionIdSet ServiceLiasonMongod::getActiveOpSessions() const {
     return activeSessions;
 }
 
-LogicalSessionIdSet ServiceLiasonMongod::getOpenCursorSessions() const {
+LogicalSessionIdSet ServiceLiaisonMongod::getOpenCursorSessions() const {
     LogicalSessionIdSet cursorSessions;
     // Append any in-use session ids from the global and collection-level cursor managers
     boost::optional<ServiceContext::UniqueOperationContext> uniqueCtx;
@@ -84,26 +84,26 @@ LogicalSessionIdSet ServiceLiasonMongod::getOpenCursorSessions() const {
     return cursorSessions;
 }
 
-void ServiceLiasonMongod::scheduleJob(PeriodicRunner::PeriodicJob job) {
+void ServiceLiaisonMongod::scheduleJob(PeriodicRunner::PeriodicJob job) {
     invariant(hasGlobalServiceContext());
     getGlobalServiceContext()->getPeriodicRunner()->scheduleJob(std::move(job));
 }
 
-void ServiceLiasonMongod::join() {
+void ServiceLiaisonMongod::join() {
     invariant(hasGlobalServiceContext());
     getGlobalServiceContext()->getPeriodicRunner()->shutdown();
 }
 
-Date_t ServiceLiasonMongod::now() const {
+Date_t ServiceLiaisonMongod::now() const {
     invariant(hasGlobalServiceContext());
     return getGlobalServiceContext()->getFastClockSource()->now();
 }
 
-ServiceContext* ServiceLiasonMongod::_context() {
+ServiceContext* ServiceLiaisonMongod::_context() {
     return getGlobalServiceContext();
 }
 
-std::pair<Status, int> ServiceLiasonMongod::killCursorsWithMatchingSessions(
+std::pair<Status, int> ServiceLiaisonMongod::killCursorsWithMatchingSessions(
     OperationContext* opCtx, const SessionKiller::Matcher& matcher) {
     return CursorManager::getGlobalCursorManager()->killCursorsWithMatchingSessions(opCtx, matcher);
 }
diff --git a/src/mongo/db/service_liason_mongod.h b/src/mongo/db/service_liaison_mongod.h
index 562429efca5..ef152b270e0 100644
--- a/src/mongo/db/service_liason_mongod.h
+++ b/src/mongo/db/service_liaison_mongod.h
@@ -30,14 +30,14 @@
 
 #include "mongo/db/logical_session_id.h"
 #include "mongo/db/operation_context.h"
-#include "mongo/db/service_liason.h"
+#include "mongo/db/service_liaison.h"
 #include "mongo/util/periodic_runner.h"
 #include "mongo/util/time_support.h"
 
 namespace mongo {
 
 /**
- * This is the service liason to mongod for the logical session cache.
+ * This is the service liaison to mongod for the logical session cache.
  *
  * This class will return active sessions for cursors stored in the
  * global cursor manager and cursors in per-collection managers. This
@@ -48,7 +48,7 @@ namespace mongo {
  * periodic runner for this mongod. The time will be returned from the
  * system clock.
  */
-class ServiceLiasonMongod : public ServiceLiason {
+class ServiceLiaisonMongod : public ServiceLiaison {
 public:
     LogicalSessionIdSet getActiveOpSessions() const override;
     LogicalSessionIdSet getOpenCursorSessions() const override;
diff --git a/src/mongo/db/service_liason_mongos.cpp b/src/mongo/db/service_liaison_mongos.cpp
index f972d87951f..2775877ae94 100644
--- a/src/mongo/db/service_liason_mongos.cpp
+++ b/src/mongo/db/service_liaison_mongos.cpp
@@ -28,7 +28,7 @@
 
 #include "mongo/platform/basic.h"
 
-#include "mongo/db/service_liason_mongos.h"
+#include "mongo/db/service_liaison_mongos.h"
 
 #include "mongo/db/service_context.h"
 #include "mongo/s/grid.h"
@@ -39,7 +39,7 @@
 
 namespace mongo {
 
-LogicalSessionIdSet ServiceLiasonMongos::getActiveOpSessions() const {
+LogicalSessionIdSet ServiceLiaisonMongos::getActiveOpSessions() const {
     LogicalSessionIdSet activeSessions;
 
     invariant(hasGlobalServiceContext());
@@ -51,32 +51,32 @@ LogicalSessionIdSet ServiceLiasonMongos::getActiveOpSessions() const {
     return activeSessions;
 }
 
-LogicalSessionIdSet ServiceLiasonMongos::getOpenCursorSessions() const {
+LogicalSessionIdSet ServiceLiaisonMongos::getOpenCursorSessions() const {
     LogicalSessionIdSet openCursorSessions;
 
     return openCursorSessions;
 }
 
-void ServiceLiasonMongos::scheduleJob(PeriodicRunner::PeriodicJob job) {
+void ServiceLiaisonMongos::scheduleJob(PeriodicRunner::PeriodicJob job) {
     invariant(hasGlobalServiceContext());
     getGlobalServiceContext()->getPeriodicRunner()->scheduleJob(std::move(job));
 }
 
-void ServiceLiasonMongos::join() {
+void ServiceLiaisonMongos::join() {
     invariant(hasGlobalServiceContext());
     getGlobalServiceContext()->getPeriodicRunner()->shutdown();
 }
 
-Date_t ServiceLiasonMongos::now() const {
+Date_t ServiceLiaisonMongos::now() const {
     invariant(hasGlobalServiceContext());
     return getGlobalServiceContext()->getFastClockSource()->now();
 }
 
-ServiceContext* ServiceLiasonMongos::_context() {
+ServiceContext* ServiceLiaisonMongos::_context() {
     return getGlobalServiceContext();
 }
 
-std::pair<Status, int> ServiceLiasonMongos::killCursorsWithMatchingSessions(
+std::pair<Status, int> ServiceLiaisonMongos::killCursorsWithMatchingSessions(
     OperationContext* opCtx, const SessionKiller::Matcher& matcher) {
     auto cursorManager = Grid::get(getGlobalServiceContext())->getCursorManager();
     return cursorManager->killCursorsWithMatchingSessions(opCtx, matcher);
diff --git a/src/mongo/db/service_liason_mongos.h b/src/mongo/db/service_liaison_mongos.h
index 4ff26b8cb1c..abed7233106 100644
--- a/src/mongo/db/service_liason_mongos.h
+++ b/src/mongo/db/service_liaison_mongos.h
@@ -30,14 +30,14 @@
 
 #include "mongo/db/logical_session_id.h"
 #include "mongo/db/operation_context.h"
-#include "mongo/db/service_liason.h"
+#include "mongo/db/service_liaison.h"
 #include "mongo/util/periodic_runner.h"
 #include "mongo/util/time_support.h"
 
 namespace mongo {
 
 /**
- * This is the service liason to mongos for the logical session cache.
+ * This is the service liaison to mongos for the logical session cache.
  *
  * This class will return active sessions for cursors stored in the
  * global cursor manager and cursors in per-collection managers. This
@@ -48,7 +48,7 @@ namespace mongo {
  * periodic runner for this mongos. The time will be returned from the
  * system clock.
  */
-class ServiceLiasonMongos : public ServiceLiason {
+class ServiceLiaisonMongos : public ServiceLiaison {
 public:
     LogicalSessionIdSet getActiveOpSessions() const override;
     LogicalSessionIdSet getOpenCursorSessions() const override;