diff --git a/library/source/OpenCDMSystemPrivate.cpp b/library/source/OpenCDMSystemPrivate.cpp
index dc860ac..cc57c83 100644
--- a/library/source/OpenCDMSystemPrivate.cpp
+++ b/library/source/OpenCDMSystemPrivate.cpp
@@ -44,7 +44,7 @@ OpenCDMSystemPrivate::OpenCDMSystemPrivate(const std::string &system, const std:
         return;
     }
     firebolt::rialto::ApplicationState initialState{firebolt::rialto::ApplicationState::UNKNOWN};
-    m_control->registerClient(m_cdmBackend, initialState);
+    m_control->registerClientAndUnregisterOnDestruction(m_cdmBackend, initialState);
     m_cdmBackend->initialize(initialState);
 }
 
diff --git a/tests/mocks/ControlMock.h b/tests/mocks/ControlMock.h
index 501196e..b39f115 100644
--- a/tests/mocks/ControlMock.h
+++ b/tests/mocks/ControlMock.h
@@ -35,7 +35,8 @@ class ControlFactoryMock : public IControlFactory
 class ControlMock : public IControl
 {
 public:
-    MOCK_METHOD(bool, registerClient, (std::weak_ptr<IControlClient> client, ApplicationState &appState), (override));
+    MOCK_METHOD(bool, registerClientAndUnregisterOnDestruction,
+                (std::weak_ptr<IControlClient> client, ApplicationState &appState), (override));
 };
 } // namespace firebolt::rialto
 
diff --git a/tests/ut/OpenCdmSystemTests.cpp b/tests/ut/OpenCdmSystemTests.cpp
index 3e00b97..6abdb21 100644
--- a/tests/ut/OpenCdmSystemTests.cpp
+++ b/tests/ut/OpenCdmSystemTests.cpp
@@ -63,7 +63,8 @@ class OpenCdmSystemTests : public testing::Test
     void createValidSut()
     {
         EXPECT_CALL(*m_controlFactoryMock, createControl()).WillOnce(Return(m_controlMock));
-        EXPECT_CALL(*m_controlMock, registerClient(_, _)).WillOnce(DoAll(SetArgReferee<1>(kAppState), Return(true)));
+        EXPECT_CALL(*m_controlMock, registerClientAndUnregisterOnDestruction(_, _))
+            .WillOnce(DoAll(SetArgReferee<1>(kAppState), Return(true)));
         EXPECT_CALL(*m_mediaKeysFactoryMock, createMediaKeys(kKeySystem)).WillOnce(Return(ByMove(std::move(m_mediaKeys))));
 
         auto messageDispatcher = std::make_shared<MessageDispatcher>();
diff --git a/tests/ut/OpenCdmTests.cpp b/tests/ut/OpenCdmTests.cpp
index 70314bf..25f461c 100644
--- a/tests/ut/OpenCdmTests.cpp
+++ b/tests/ut/OpenCdmTests.cpp
@@ -69,7 +69,7 @@ class OpenCdmTests : public testing::Test
 TEST_F(OpenCdmTests, ShouldCreateAndDestroySystem)
 {
     EXPECT_CALL(*m_controlFactoryMock, createControl()).WillOnce(Return(m_controlMock));
-    EXPECT_CALL(*m_controlMock, registerClient(_, _)).WillOnce(Return(true));
+    EXPECT_CALL(*m_controlMock, registerClientAndUnregisterOnDestruction(_, _)).WillOnce(Return(true));
     auto *system{opencdm_create_system(kNetflixKeySystem.c_str())};
     EXPECT_NE(nullptr, system);
     EXPECT_EQ(ERROR_NONE, opencdm_destruct_system(system));