diff --git a/client/text_ui.py b/client/text_ui.py
index 7c1f452ea..c990ca7cc 100644
--- a/client/text_ui.py
+++ b/client/text_ui.py
@@ -270,7 +270,7 @@ def upgrade_packages(onlyfetch = False, replay = False, resume = False,
 
         print_info(red(" @@ ")+blue("%s..." % (_("Calculating System Updates"),) ))
         try:
-            update, remove, fine, spm_fine = E_CLIENT.calculate_world_updates(
+            update, remove, fine, spm_fine = E_CLIENT.calculate_updates(
                 empty_deps = replay)
         except SystemDatabaseError:
             # handled in equo.py
diff --git a/libraries/entropy/client/interfaces/cache.py b/libraries/entropy/client/interfaces/cache.py
index 2855b0408..f38d40a86 100644
--- a/libraries/entropy/client/interfaces/cache.py
+++ b/libraries/entropy/client/interfaces/cache.py
@@ -71,7 +71,7 @@ class CacheMixin:
         # we can barely ignore any exception from here
         # especially cases where client db does not exist
         try:
-            update, remove, fine, spm_fine = self.calculate_world_updates()
+            update, remove, fine, spm_fine = self.calculate_updates()
             del fine, spm_fine, remove
             if do_install_queue:
                 self.get_install_queue(update, False, False)
diff --git a/libraries/entropy/client/interfaces/client.py b/libraries/entropy/client/interfaces/client.py
index 033595ad7..477102389 100644
--- a/libraries/entropy/client/interfaces/client.py
+++ b/libraries/entropy/client/interfaces/client.py
@@ -208,7 +208,7 @@ class ClientSystemSettingsPlugin(SystemSettingsPlugin):
         # issues with metadata not being available
         try:
             update, remove, fine, spm_fine = \
-                self._helper.calculate_world_updates(
+                self._helper.calculate_updates(
                     critical_updates = False)
         except (ValueError, SystemDatabaseError, RepositoryError,):
             # RepositoryError is triggered when branch is hopped
diff --git a/libraries/entropy/client/interfaces/dep.py b/libraries/entropy/client/interfaces/dep.py
index d152b9663..8f0139b35 100644
--- a/libraries/entropy/client/interfaces/dep.py
+++ b/libraries/entropy/client/interfaces/dep.py
@@ -1594,7 +1594,7 @@ class CalculatorsMixin:
         return data
 
 
-    def calculate_world_updates(self, empty_deps = False, use_cache = True,
+    def calculate_updates(self, empty_deps = False, use_cache = True,
         critical_updates = True):
 
         cl_settings = self.SystemSettings[self.sys_settings_client_plugin_id]
@@ -1631,7 +1631,7 @@ class CalculatorsMixin:
 
         maxlen = len(idpackages)
         count = 0
-        mytxt = _("Calculating world packages")
+        mytxt = _("Calculating updates")
         for idpackage in idpackages:
 
             count += 1
diff --git a/services/client-updates-daemon b/services/client-updates-daemon
index a1cef0d6c..94cc911d5 100755
--- a/services/client-updates-daemon
+++ b/services/client-updates-daemon
@@ -353,7 +353,7 @@ class UpdatesDaemon(dbus.service.Object):
 
                 try:
                     update, remove, fine, spm_fine = \
-                        entropy.calculate_world_updates(use_cache = False)
+                        entropy.calculate_updates(use_cache = False)
                     del fine, remove
                 except Exception, err:
                     entropyTools.print_traceback(f = DAEMON_LOG)
@@ -460,7 +460,7 @@ class UpdatesDaemon(dbus.service.Object):
 
             try:
                 update, remove, fine, spm_fine = \
-                    entropy.calculate_world_updates(use_cache = False)
+                    entropy.calculate_updates(use_cache = False)
             except Exception, err:
                 entropyTools.print_traceback(f = DAEMON_LOG)
                 msg = "get_updates: %s: %s" % (_("Updates: error"), err,)
diff --git a/sulfur/src/sulfur/packages.py b/sulfur/src/sulfur/packages.py
index a10fce712..2f41b76c6 100644
--- a/sulfur/src/sulfur/packages.py
+++ b/sulfur/src/sulfur/packages.py
@@ -748,7 +748,7 @@ class EntropyPackages:
 
         try:
             updates, remove, fine, spm_fine = \
-                self.Entropy.calculate_world_updates(
+                self.Entropy.calculate_updates(
                     critical_updates = critical_updates)
         except SystemDatabaseError:
             # broken client db