diff --git a/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.kt b/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.kt
index 2dc1a8f13..afbc02e8c 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.kt
@@ -87,7 +87,7 @@ import com.nextcloud.talk.utils.NotificationUtils.getCallRingtoneUri
 import com.nextcloud.talk.utils.NotificationUtils.getMessageRingtoneUri
 import com.nextcloud.talk.utils.SecurityUtils
 import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ARE_CALL_SOUNDS
-import com.nextcloud.talk.utils.database.user.CapabilitiesNgUtil
+import com.nextcloud.talk.utils.database.user.CapabilitiesUtilNew
 import com.nextcloud.talk.utils.database.user.CurrentUserProviderNew
 import com.nextcloud.talk.utils.database.user.UserUtils
 import com.nextcloud.talk.utils.preferences.MagicUserInputModule
@@ -190,7 +190,7 @@ class SettingsController : NewBaseController(R.layout.controller_settings) {
     }
 
     private fun setupPhoneBookIntegration() {
-        if (CapabilitiesNgUtil.isPhoneBookIntegrationAvailable(currentUser)) {
+        if (CapabilitiesUtilNew.isPhoneBookIntegrationAvailable(currentUser)) {
             activity!!.runOnUiThread {
                 binding.settingsPhoneBookIntegration.visibility = View.VISIBLE
             }
@@ -648,7 +648,7 @@ class SettingsController : NewBaseController(R.layout.controller_settings) {
 
     private fun setupServerAgeWarning() {
         when {
-            CapabilitiesNgUtil.isServerEOL(currentUser) -> {
+            CapabilitiesUtilNew.isServerEOL(currentUser) -> {
                 binding.serverAgeWarningText.setTextColor(ContextCompat.getColor((context)!!, R.color.nc_darkRed))
                 binding.serverAgeWarningText.setText(R.string.nc_settings_server_eol)
                 binding.serverAgeWarningIcon.setColorFilter(
@@ -656,7 +656,7 @@ class SettingsController : NewBaseController(R.layout.controller_settings) {
                     PorterDuff.Mode.SRC_IN
                 )
             }
-            CapabilitiesNgUtil.isServerAlmostEOL(currentUser) -> {
+            CapabilitiesUtilNew.isServerAlmostEOL(currentUser) -> {
                 binding.serverAgeWarningText.setTextColor(
                     ContextCompat.getColor((context)!!, R.color.nc_darkYellow)
                 )
@@ -688,7 +688,7 @@ class SettingsController : NewBaseController(R.layout.controller_settings) {
 
         if (CapabilitiesUtil.isReadStatusAvailable(userUtils.currentUser)) {
             (binding.settingsReadPrivacy.findViewById<View>(R.id.mp_checkable) as Checkable).isChecked =
-                !CapabilitiesNgUtil.isReadStatusPrivate(currentUser)
+                !CapabilitiesUtilNew.isReadStatusPrivate(currentUser)
         } else {
             binding.settingsReadPrivacy.visibility = View.GONE
         }
diff --git a/app/src/main/java/com/nextcloud/talk/models/database/CapabilitiesUtil.java b/app/src/main/java/com/nextcloud/talk/models/database/CapabilitiesUtil.java
index 135946486..423084b2c 100644
--- a/app/src/main/java/com/nextcloud/talk/models/database/CapabilitiesUtil.java
+++ b/app/src/main/java/com/nextcloud/talk/models/database/CapabilitiesUtil.java
@@ -33,6 +33,10 @@ import java.util.Map;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+/**
+ * Deprecated, please use CapabilitiesNgUtil
+ */
+@Deprecated
 public abstract class CapabilitiesUtil {
     private static final String TAG = CapabilitiesUtil.class.getSimpleName();
 
@@ -66,13 +70,11 @@ public abstract class CapabilitiesUtil {
         return false;
     }
 
-    @Deprecated
     public static boolean isServerEOL(@Nullable UserEntity user) {
         // Capability is available since Talk 4 => Nextcloud 14 => Autmn 2018
         return !hasSpreedFeatureCapability(user, "no-ping");
     }
 
-    @Deprecated
     public static boolean isServerAlmostEOL(@Nullable UserEntity user) {
         // Capability is available since Talk 8 => Nextcloud 18 => January 2020
         return !hasSpreedFeatureCapability(user, "chat-replies");
@@ -82,7 +84,6 @@ public abstract class CapabilitiesUtil {
         return hasSpreedFeatureCapability(user, "chat-read-marker");
     }
 
-    @Deprecated
     public static boolean hasSpreedFeatureCapability(@Nullable UserEntity user, String capabilityName) {
         if (user != null && user.getCapabilities() != null) {
             try {
diff --git a/app/src/main/java/com/nextcloud/talk/utils/database/user/CapabilitiesNgUtil.java b/app/src/main/java/com/nextcloud/talk/utils/database/user/CapabilitiesUtilNew.java
similarity index 98%
rename from app/src/main/java/com/nextcloud/talk/utils/database/user/CapabilitiesNgUtil.java
rename to app/src/main/java/com/nextcloud/talk/utils/database/user/CapabilitiesUtilNew.java
index 35fb5ea33..f87ff4ca4 100644
--- a/app/src/main/java/com/nextcloud/talk/utils/database/user/CapabilitiesNgUtil.java
+++ b/app/src/main/java/com/nextcloud/talk/utils/database/user/CapabilitiesUtilNew.java
@@ -29,8 +29,7 @@ import java.util.Map;
 
 import androidx.annotation.Nullable;
 
-public abstract class CapabilitiesNgUtil {
-    private static final String TAG = CapabilitiesNgUtil.class.getSimpleName();
+public abstract class CapabilitiesUtilNew {
 
     public static boolean hasNotificationsCapability(@Nullable User user, String capabilityName) {
         if (user != null && user.getCapabilities() != null) {