diff --git a/core/src/main/java/org/futo/circles/core/feature/room/invite/InviteMembersViewModel.kt b/core/src/main/java/org/futo/circles/core/feature/room/invite/InviteMembersViewModel.kt
index 858de5c47677e56306f9059bf12c50e6127d1da3..0be33a104fc6b19219cb74a6790f0dfd2600901c 100644
--- a/core/src/main/java/org/futo/circles/core/feature/room/invite/InviteMembersViewModel.kt
+++ b/core/src/main/java/org/futo/circles/core/feature/room/invite/InviteMembersViewModel.kt
@@ -18,7 +18,7 @@ import javax.inject.Inject
 @HiltViewModel
 class InviteMembersViewModel @Inject constructor(
     savedStateHandle: SavedStateHandle,
-    private val dataSource: InviteRequestsDataSource
+    private val dataSource: ManageInviteRequestsDataSource
 ) : ViewModel() {
 
     private val roomId: String = savedStateHandle.getOrThrow("roomId")
diff --git a/core/src/main/java/org/futo/circles/core/feature/room/invite/InviteRequestsDataSource.kt b/core/src/main/java/org/futo/circles/core/feature/room/invite/ManageInviteRequestsDataSource.kt
similarity index 97%
rename from core/src/main/java/org/futo/circles/core/feature/room/invite/InviteRequestsDataSource.kt
rename to core/src/main/java/org/futo/circles/core/feature/room/invite/ManageInviteRequestsDataSource.kt
index 07e9ce33c22f32bbf2ae4959946dbf8bce0475ee..df6498bcd6c2e633ced2e0d8cc25201d52cdf8e2 100644
--- a/core/src/main/java/org/futo/circles/core/feature/room/invite/InviteRequestsDataSource.kt
+++ b/core/src/main/java/org/futo/circles/core/feature/room/invite/ManageInviteRequestsDataSource.kt
@@ -14,7 +14,7 @@ import org.matrix.android.sdk.api.session.getRoom
 import javax.inject.Inject
 
 @ViewModelScoped
-class InviteRequestsDataSource @Inject constructor(
+class ManageInviteRequestsDataSource @Inject constructor(
     private val roomRelationsBuilder: RoomRelationsBuilder
 ) {
 
diff --git a/core/src/main/java/org/futo/circles/core/feature/room/invites/InvitesViewModel.kt b/core/src/main/java/org/futo/circles/core/feature/room/invites/InvitesViewModel.kt
index a8443ab680c8351e605feb096754c25dbfe48765..bc0ab872ecab923b92a97c2dd29e25bb14a5437f 100644
--- a/core/src/main/java/org/futo/circles/core/feature/room/invites/InvitesViewModel.kt
+++ b/core/src/main/java/org/futo/circles/core/feature/room/invites/InvitesViewModel.kt
@@ -8,7 +8,7 @@ import org.futo.circles.core.base.SingleEventLiveData
 import org.futo.circles.core.extensions.Response
 import org.futo.circles.core.extensions.getOrThrow
 import org.futo.circles.core.extensions.launchBg
-import org.futo.circles.core.feature.room.invite.InviteRequestsDataSource
+import org.futo.circles.core.feature.room.invite.ManageInviteRequestsDataSource
 import org.futo.circles.core.model.CircleRoomTypeArg
 import org.futo.circles.core.model.InviteTypeArg
 import javax.inject.Inject
@@ -17,7 +17,7 @@ import javax.inject.Inject
 class InvitesViewModel @Inject constructor(
     savedStateHandle: SavedStateHandle,
     private val dataSource: InvitesDataSource,
-    private val inviteRequestsDataSource: InviteRequestsDataSource
+    private val manageInviteRequestsDataSource: ManageInviteRequestsDataSource
 ) : ViewModel() {
 
     private val inviteType: InviteTypeArg = savedStateHandle.getOrThrow("type")
@@ -29,14 +29,14 @@ class InvitesViewModel @Inject constructor(
 
     fun rejectRoomInvite(roomId: String) {
         launchBg {
-            val result = inviteRequestsDataSource.rejectInvite(roomId)
+            val result = manageInviteRequestsDataSource.rejectInvite(roomId)
             inviteResultLiveData.postValue(result)
         }
     }
 
     fun acceptRoomInvite(roomId: String, roomType: CircleRoomTypeArg) {
         launchBg {
-            val result = inviteRequestsDataSource.acceptInvite(roomId, roomType)
+            val result = manageInviteRequestsDataSource.acceptInvite(roomId, roomType)
             inviteResultLiveData.postValue(result)
         }
     }
diff --git a/core/src/main/java/org/futo/circles/core/feature/room/knoks/KnockRequestViewModel.kt b/core/src/main/java/org/futo/circles/core/feature/room/knoks/KnockRequestViewModel.kt
index 9887aca60dac672351f1ab2fff6e7aae654c72a3..fc6c48a179e3b0290cd1f83f9a174b6d5e048ec8 100644
--- a/core/src/main/java/org/futo/circles/core/feature/room/knoks/KnockRequestViewModel.kt
+++ b/core/src/main/java/org/futo/circles/core/feature/room/knoks/KnockRequestViewModel.kt
@@ -7,14 +7,14 @@ import org.futo.circles.core.base.SingleEventLiveData
 import org.futo.circles.core.extensions.Response
 import org.futo.circles.core.extensions.getOrThrow
 import org.futo.circles.core.extensions.launchBg
-import org.futo.circles.core.feature.room.invite.InviteRequestsDataSource
+import org.futo.circles.core.feature.room.invite.ManageInviteRequestsDataSource
 import org.futo.circles.core.model.KnockRequestListItem
 import javax.inject.Inject
 
 @HiltViewModel
 class KnockRequestViewModel @Inject constructor(
     savedStateHandle: SavedStateHandle,
-    private val inviteRequestsDataSource: InviteRequestsDataSource,
+    private val manageInviteRequestsDataSource: ManageInviteRequestsDataSource,
     knockRequestsDataSource: KnockRequestsDataSource
 ) : ViewModel() {
 
@@ -25,13 +25,13 @@ class KnockRequestViewModel @Inject constructor(
 
     fun inviteUser(user: KnockRequestListItem) {
         launchBg {
-            val result = inviteRequestsDataSource.inviteUser(roomId, user.requesterId)
+            val result = manageInviteRequestsDataSource.inviteUser(roomId, user.requesterId)
             inviteResultLiveData.postValue(result)
         }
     }
 
     fun kickUser(user: KnockRequestListItem) {
-        launchBg { inviteRequestsDataSource.kickUser(roomId, user.requesterId) }
+        launchBg { manageInviteRequestsDataSource.kickUser(roomId, user.requesterId) }
     }
 
 }
diff --git a/core/src/main/java/org/futo/circles/core/feature/user/UserViewModel.kt b/core/src/main/java/org/futo/circles/core/feature/user/UserViewModel.kt
index a4b6a082a903b50d3fb027ff7ee9129cf27179c9..e8923ab3b5a67df00c0c154f5a2c431627b32f2e 100644
--- a/core/src/main/java/org/futo/circles/core/feature/user/UserViewModel.kt
+++ b/core/src/main/java/org/futo/circles/core/feature/user/UserViewModel.kt
@@ -13,7 +13,7 @@ import org.futo.circles.core.extensions.getOrThrow
 import org.futo.circles.core.extensions.launchBg
 import org.futo.circles.core.extensions.launchUi
 import org.futo.circles.core.feature.room.RoomRelationsBuilder
-import org.futo.circles.core.feature.room.invite.InviteRequestsDataSource
+import org.futo.circles.core.feature.room.invite.ManageInviteRequestsDataSource
 import org.futo.circles.core.feature.workspace.SharedCircleDataSource
 import org.futo.circles.core.model.TimelineListItem
 import org.futo.circles.core.provider.MatrixSessionProvider
@@ -26,7 +26,7 @@ class UserViewModel @Inject constructor(
     private val userDataSource: UserDataSource,
     private val userOptionsDataSource: UserOptionsDataSource,
     private val roomRelationsBuilder: RoomRelationsBuilder,
-    private val inviteRequestsDataSource: InviteRequestsDataSource,
+    private val manageInviteRequestsDataSource: ManageInviteRequestsDataSource,
     sharedCircleDataSource: SharedCircleDataSource
 ) : ViewModel() {
 
@@ -103,7 +103,7 @@ class UserViewModel @Inject constructor(
 
     fun inviteToMySharedCircle() {
         launchBg {
-            val result = inviteRequestsDataSource.inviteUser(profileRoomId, userId)
+            val result = manageInviteRequestsDataSource.inviteUser(profileRoomId, userId)
             inviteToConnectLiveData.postValue(result)
         }
     }