diff --git a/src/common/config.py b/src/common/config.py
index 4afe76855..2e44d5bd1 100644
--- a/src/common/config.py
+++ b/src/common/config.py
@@ -130,7 +130,7 @@ class Config:
 		'dictionary_url': [opt_str, 'WIKTIONARY', _("Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' which means use wiktionary.")],
 		'always_english_wikipedia': [opt_bool, False],
 		'always_english_wiktionary': [opt_bool, True],
-		'use_dbus': [opt_bool, True, _('Allow controlling Gajim via D-Bus service.')],
+		'remote_control': [opt_bool, True, _('If checked, Gajim can be controlled remotely using gajim-remote.')],
 		'chat_state_notifications': [opt_str, 'all'], # 'all', 'composing_only', 'disabled'
 		'autodetect_browser_mailer': [opt_bool, True],
 		'print_ichat_every_foo_minutes': [opt_int, 5],
diff --git a/src/gajim.py b/src/gajim.py
index cbbfc714f..19248a286 100755
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -1208,7 +1208,7 @@ class Interface:
 				strerr).get_response()
 			sys.exit(1)
 
-	def enable_dbus(self):
+	def enable_remote_control(self):
 		if 'remote_control' not in globals():
 			import remote_control
 		if not hasattr(self, 'remote') or not self.remote:
@@ -1225,7 +1225,7 @@ class Interface:
 			self.remote.set_enabled(True)
 		return True
 
-	def disable_dbus(self):
+	def disable_remote_control(self):
 		if hasattr(self, 'remote') and self.remote is not None:
 			# just tell the remote object to skip remote messages
 			self.remote.set_enabled(False)
@@ -1311,10 +1311,10 @@ class Interface:
 			gajim.events_for_ui[a] = []
 
 		self.roster = roster_window.RosterWindow()
-		if gajim.config.get('use_dbus'):
-			self.enable_dbus()
+		if gajim.config.get('remote_control'):
+			self.enable_remote_control()
 		else:
-			self.disable_dbus()
+			self.disable_remote_control()
 
 		self.show_vcard_when_connect = []