2005-02-17 Colin Walters <walters@verbum.org>

	* dbus/dbus-protocol.h (DBUS_SERVICE_ORG_FREEDESKTOP_DBUS):
	Rename to DBUS_SERVICE_DBUS.
	(DBUS_PATH_ORG_FREEDESKTOP_DBUS): Rename to DBUS_PATH_DBUS.
	(DBUS_PATH_ORG_FREEDESKTOP_LOCAL): Rename to DBUS_PATH_LOCAL.
	(DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS): Rename to DBUS_INTERFACE_DBUS.
	(DBUS_INTERFACE_ORG_FREEDESKTOP_INTROSPECTABLE): Rename to
	DBUS_INTERFACE_INTROSPECTABLE.
	(DBUS_INTERFACE_ORG_FREEDESKTOP_PROPERTIES): Rename to
	DBUS_INTERFACE_PROPERTIES.
	(DBUS_INTERFACE_ORG_FREEDESKTOP_PEER): Rename to
	DBUS_INTERFACE_PEER.
	(DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL):
	DBUS_INTERFACE_LOCAL.

	All other users of those constants have been changed.

	* bus/driver.c (bus_driver_handle_introspect): Use constants.

	* glib/dbus-gobject.c (handle_introspect): Use constants.

	* doc/dbus-faq.xml, doc/dbus-specification.xml: Update for rename.

6 files changed, 70 insertions, 70 deletions

diff --git a/bus/bus.c b/bus/bus.c
index a80636b1..cd2a0401 100644
--- a/bus/bus.c
+++ b/bus/bus.c
@@ -1103,7 +1103,7 @@ bus_context_check_security_policy (BusContext     *context,
                 (sender == NULL && !bus_connection_is_active (proposed_recipient)));
   _dbus_assert (type == DBUS_MESSAGE_TYPE_SIGNAL ||
                 addressed_recipient != NULL ||
-                strcmp (dbus_message_get_destination (message), DBUS_SERVICE_ORG_FREEDESKTOP_DBUS) == 0);
+                strcmp (dbus_message_get_destination (message), DBUS_SERVICE_DBUS) == 0);
   
   switch (type)
     {
@@ -1139,7 +1139,7 @@ bus_context_check_security_policy (BusContext     *context,
 				    dbus_message_get_interface (message),
 				    dbus_message_get_member (message),
 				    dbus_message_get_error_name (message),
-				    dest ? dest : DBUS_SERVICE_ORG_FREEDESKTOP_DBUS))
+				    dest ? dest : DBUS_SERVICE_DBUS))
         {
           dbus_set_error (error, DBUS_ERROR_ACCESS_DENIED,
                           "An SELinux policy prevents this sender "
@@ -1152,7 +1152,7 @@ bus_context_check_security_policy (BusContext     *context,
                           dbus_message_get_member (message) : "(unset)",
                           dbus_message_get_error_name (message) ?
                           dbus_message_get_error_name (message) : "(unset)",
-                          dest ? dest : DBUS_SERVICE_ORG_FREEDESKTOP_DBUS);
+                          dest ? dest : DBUS_SERVICE_DBUS);
           _dbus_verbose ("SELinux security check denying send to service\n");
           return FALSE;
         }
@@ -1192,7 +1192,7 @@ bus_context_check_security_policy (BusContext     *context,
            */
           if (proposed_recipient == NULL &&
               dbus_message_is_method_call (message,
-                                           DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS,
+                                           DBUS_INTERFACE_DBUS,
                                            "Hello"))
             {
               _dbus_verbose ("security check allowing %s message\n",
@@ -1277,7 +1277,7 @@ bus_context_check_security_policy (BusContext     *context,
                       dbus_message_get_member (message) : "(unset)",
                       dbus_message_get_error_name (message) ?
                       dbus_message_get_error_name (message) : "(unset)",
-                      dest ? dest : DBUS_SERVICE_ORG_FREEDESKTOP_DBUS);
+                      dest ? dest : DBUS_SERVICE_DBUS);
       _dbus_verbose ("security policy disallowing message due to sender policy\n");
       return FALSE;
     }
@@ -1304,7 +1304,7 @@ bus_context_check_security_policy (BusContext     *context,
                       dbus_message_get_member (message) : "(unset)",
                       dbus_message_get_error_name (message) ?
                       dbus_message_get_error_name (message) : "(unset)",
-                      dest ? dest : DBUS_SERVICE_ORG_FREEDESKTOP_DBUS,
+                      dest ? dest : DBUS_SERVICE_DBUS,
                       dbus_message_get_reply_serial (message),
                       requested_reply);
       _dbus_verbose ("security policy disallowing message due to recipient policy\n");
@@ -1323,7 +1323,7 @@ bus_context_check_security_policy (BusContext     *context,
                       "The destination service \"%s\" has a full message queue",
                       dest ? dest : (proposed_recipient ?
                                      bus_connection_get_name (proposed_recipient) : 
-                                     DBUS_SERVICE_ORG_FREEDESKTOP_DBUS));
+                                     DBUS_SERVICE_DBUS));
       _dbus_verbose ("security policy disallowing message due to full message queue\n");
       return FALSE;
     }
diff --git a/bus/connection.c b/bus/connection.c
index 474a3375..d11621ae 100644
--- a/bus/connection.c
+++ b/bus/connection.c
@@ -1091,7 +1091,7 @@ bus_connection_preallocate_oom_error (DBusConnection *connection)
   if (!dbus_message_set_error_name (message, DBUS_ERROR_NO_MEMORY) ||
       !dbus_message_set_destination (message, d->name) ||
       !dbus_message_set_sender (message,
-                                DBUS_SERVICE_ORG_FREEDESKTOP_DBUS))
+                                DBUS_SERVICE_DBUS))
     {
       dbus_connection_free_preallocated_send (connection, preallocated);
       dbus_message_unref (message);
@@ -1912,7 +1912,7 @@ bus_transaction_send_from_driver (BusTransaction *transaction,
                  dbus_message_get_error_name (message) ?
                  dbus_message_get_error_name (message) : "(no error name)");
                  
-  if (!dbus_message_set_sender (message, DBUS_SERVICE_ORG_FREEDESKTOP_DBUS))
+  if (!dbus_message_set_sender (message, DBUS_SERVICE_DBUS))
     return FALSE;
 
   if (bus_connection_is_active (connection))
diff --git a/bus/dispatch.c b/bus/dispatch.c
index 96115b1c..0803843e 100644
--- a/bus/dispatch.c
+++ b/bus/dispatch.c
@@ -180,7 +180,7 @@ bus_dispatch (DBusConnection *connection,
   if (service_name == NULL)
     {
       if (dbus_message_is_signal (message,
-                                  DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL,
+                                  DBUS_INTERFACE_LOCAL,
                                   "Disconnected"))
         {
           bus_connection_disconnected (connection);
@@ -226,7 +226,7 @@ bus_dispatch (DBusConnection *connection,
     }
   
   if (service_name &&
-      strcmp (service_name, DBUS_SERVICE_ORG_FREEDESKTOP_DBUS) == 0) /* to bus driver */
+      strcmp (service_name, DBUS_SERVICE_DBUS) == 0) /* to bus driver */
     {
       if (!bus_context_check_security_policy (context, transaction,
                                               connection, NULL, NULL, message, &error))
@@ -235,7 +235,7 @@ bus_dispatch (DBusConnection *connection,
           goto out;
         }
 
-      _dbus_verbose ("Giving message to %s\n", DBUS_SERVICE_ORG_FREEDESKTOP_DBUS);
+      _dbus_verbose ("Giving message to %s\n", DBUS_SERVICE_DBUS);
       if (!bus_driver_handle_message (connection, transaction, message, &error))
         goto out;
     }
@@ -543,7 +543,7 @@ check_service_owner_changed_foreach (DBusConnection *connection,
       goto out;
     }
   else if (!dbus_message_is_signal (message,
-                                    DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS,
+                                    DBUS_INTERFACE_DBUS,
                                     "NameOwnerChanged"))
     {
       warn_unexpected (connection, message, "NameOwnerChanged");
@@ -752,9 +752,9 @@ check_hello_message (BusContext     *context,
 
   _dbus_verbose ("check_hello_message for %p\n", connection);
   
-  message = dbus_message_new_method_call (DBUS_SERVICE_ORG_FREEDESKTOP_DBUS,
-                                          DBUS_PATH_ORG_FREEDESKTOP_DBUS,
-                                          DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS,
+  message = dbus_message_new_method_call (DBUS_SERVICE_DBUS,
+                                          DBUS_PATH_DBUS,
+                                          DBUS_INTERFACE_DBUS,
                                           "Hello");
 
   if (message == NULL)
@@ -818,7 +818,7 @@ check_hello_message (BusContext     *context,
 
   verbose_message_received (connection, message);
 
-  if (!dbus_message_has_sender (message, DBUS_SERVICE_ORG_FREEDESKTOP_DBUS))
+  if (!dbus_message_has_sender (message, DBUS_SERVICE_DBUS))
     {
       _dbus_warn ("Message has wrong sender %s\n",
                   dbus_message_get_sender (message) ?
@@ -900,7 +900,7 @@ check_hello_message (BusContext     *context,
                       "NameAcquired");
           goto out;
         }
-      if (! dbus_message_is_signal (message, DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS,
+      if (! dbus_message_is_signal (message, DBUS_INTERFACE_DBUS,
 				    "NameAcquired"))
         {
           _dbus_warn ("Expecting %s, got smthg else\n",
@@ -976,9 +976,9 @@ check_double_hello_message (BusContext     *context,
 
   _dbus_verbose ("check_double_hello_message for %p\n", connection);
   
-  message = dbus_message_new_method_call (DBUS_SERVICE_ORG_FREEDESKTOP_DBUS,
-                                          DBUS_PATH_ORG_FREEDESKTOP_DBUS,
-                                          DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS,
+  message = dbus_message_new_method_call (DBUS_SERVICE_DBUS,
+                                          DBUS_PATH_DBUS,
+                                          DBUS_INTERFACE_DBUS,
                                           "Hello");
 
   if (message == NULL)
@@ -1020,7 +1020,7 @@ check_double_hello_message (BusContext     *context,
 
   verbose_message_received (connection, message);
 
-  if (!dbus_message_has_sender (message, DBUS_SERVICE_ORG_FREEDESKTOP_DBUS))
+  if (!dbus_message_has_sender (message, DBUS_SERVICE_DBUS))
     {
       _dbus_warn ("Message has wrong sender %s\n",
                   dbus_message_get_sender (message) ?
@@ -1068,9 +1068,9 @@ check_get_connection_unix_user (BusContext     *context,
 
   _dbus_verbose ("check_get_connection_unix_user for %p\n", connection);
   
-  message = dbus_message_new_method_call (DBUS_SERVICE_ORG_FREEDESKTOP_DBUS,
-                                          DBUS_PATH_ORG_FREEDESKTOP_DBUS,
-                                          DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS,
+  message = dbus_message_new_method_call (DBUS_SERVICE_DBUS,
+                                          DBUS_PATH_DBUS,
+                                          DBUS_INTERFACE_DBUS,
                                           "GetConnectionUnixUser");
 
   if (message == NULL)
@@ -1205,9 +1205,9 @@ check_get_connection_unix_process_id (BusContext     *context,
 
   _dbus_verbose ("check_get_connection_unix_process_id for %p\n", connection);
   
-  message = dbus_message_new_method_call (DBUS_SERVICE_ORG_FREEDESKTOP_DBUS,
-                                          DBUS_PATH_ORG_FREEDESKTOP_DBUS,
-                                          DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS,
+  message = dbus_message_new_method_call (DBUS_SERVICE_DBUS,
+                                          DBUS_PATH_DBUS,
+                                          DBUS_INTERFACE_DBUS,
                                           "GetConnectionUnixProcessID");
 
   if (message == NULL)
@@ -1356,9 +1356,9 @@ check_add_match_all (BusContext     *context,
 
   _dbus_verbose ("check_add_match_all for %p\n", connection);
   
-  message = dbus_message_new_method_call (DBUS_SERVICE_ORG_FREEDESKTOP_DBUS,
-                                          DBUS_PATH_ORG_FREEDESKTOP_DBUS,
-                                          DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS,
+  message = dbus_message_new_method_call (DBUS_SERVICE_DBUS,
+                                          DBUS_PATH_DBUS,
+                                          DBUS_INTERFACE_DBUS,
                                           "AddMatch");
 
   if (message == NULL)
@@ -1418,7 +1418,7 @@ check_add_match_all (BusContext     *context,
 
   verbose_message_received (connection, message);
 
-  if (!dbus_message_has_sender (message, DBUS_SERVICE_ORG_FREEDESKTOP_DBUS))
+  if (!dbus_message_has_sender (message, DBUS_SERVICE_DBUS))
     {
       _dbus_warn ("Message has wrong sender %s\n",
                   dbus_message_get_sender (message) ?
@@ -1533,9 +1533,9 @@ check_nonexistent_service_no_auto_start (BusContext     *context,
   const char *nonexistent = NONEXISTENT_SERVICE_NAME;
   dbus_uint32_t flags;
   
-  message = dbus_message_new_method_call (DBUS_SERVICE_ORG_FREEDESKTOP_DBUS,
-                                          DBUS_PATH_ORG_FREEDESKTOP_DBUS,
-                                          DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS,
+  message = dbus_message_new_method_call (DBUS_SERVICE_DBUS,
+                                          DBUS_PATH_DBUS,
+                                          DBUS_INTERFACE_DBUS,
                                           "StartServiceByName");
   
   if (message == NULL)
@@ -1586,7 +1586,7 @@ check_nonexistent_service_no_auto_start (BusContext     *context,
 
   if (dbus_message_get_type (message) == DBUS_MESSAGE_TYPE_ERROR)
     {
-      if (!dbus_message_has_sender (message, DBUS_SERVICE_ORG_FREEDESKTOP_DBUS))
+      if (!dbus_message_has_sender (message, DBUS_SERVICE_DBUS))
         {
           _dbus_warn ("Message has wrong sender %s\n",
                       dbus_message_get_sender (message) ?
@@ -1679,7 +1679,7 @@ check_nonexistent_service_auto_start (BusContext     *context,
 
   if (dbus_message_get_type (message) == DBUS_MESSAGE_TYPE_ERROR)
     {
-      if (!dbus_message_has_sender (message, DBUS_SERVICE_ORG_FREEDESKTOP_DBUS))
+      if (!dbus_message_has_sender (message, DBUS_SERVICE_DBUS))
         {
           _dbus_warn ("Message has wrong sender %s\n",
                       dbus_message_get_sender (message) ?
@@ -1741,7 +1741,7 @@ check_base_service_activated (BusContext     *context,
   dbus_message_ref (message);  
 
   if (dbus_message_is_signal (message,
-                              DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS,
+                              DBUS_INTERFACE_DBUS,
                               "NameOwnerChanged"))
     {
       CheckServiceOwnerChangedData socd;
@@ -1843,7 +1843,7 @@ check_service_activated (BusContext     *context,
   dbus_message_ref (message);
 
   if (dbus_message_is_signal (message,
-                              DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS,
+                              DBUS_INTERFACE_DBUS,
                               "NameOwnerChanged"))
     {
       CheckServiceOwnerChangedData socd;
@@ -2000,7 +2000,7 @@ check_service_auto_activated (BusContext     *context,
   dbus_message_ref (message);
 
   if (dbus_message_is_signal (message,
-                              DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS,
+                              DBUS_INTERFACE_DBUS,
                               "NameOwnerChanged"))
     {
       const char *service_name;
@@ -2334,7 +2334,7 @@ check_got_service_info (DBusMessage *message)
   GotServiceInfo message_kind;
 
   if (dbus_message_is_signal (message,
-                              DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS,
+                              DBUS_INTERFACE_DBUS,
                               "NameOwnerChanged"))
     {
       DBusError error;
@@ -2400,9 +2400,9 @@ check_existent_service_no_auto_start (BusContext     *context,
 
   base_service_message = NULL;
   
-  message = dbus_message_new_method_call (DBUS_SERVICE_ORG_FREEDESKTOP_DBUS,
-                                          DBUS_PATH_ORG_FREEDESKTOP_DBUS,
-                                          DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS,
+  message = dbus_message_new_method_call (DBUS_SERVICE_DBUS,
+                                          DBUS_PATH_DBUS,
+                                          DBUS_INTERFACE_DBUS,
                                           "StartServiceByName");
 
   if (message == NULL)
@@ -2459,7 +2459,7 @@ check_existent_service_no_auto_start (BusContext     *context,
 
   if (dbus_message_get_type (message) == DBUS_MESSAGE_TYPE_ERROR)
     {
-      if (!dbus_message_has_sender (message, DBUS_SERVICE_ORG_FREEDESKTOP_DBUS))
+      if (!dbus_message_has_sender (message, DBUS_SERVICE_DBUS))
         {
           _dbus_warn ("Message has wrong sender %s\n",
                       dbus_message_get_sender (message) ?
@@ -2622,9 +2622,9 @@ check_segfault_service_no_auto_start (BusContext     *context,
   const char *segv_service;
   dbus_uint32_t flags;
   
-  message = dbus_message_new_method_call (DBUS_SERVICE_ORG_FREEDESKTOP_DBUS,
-                                          DBUS_PATH_ORG_FREEDESKTOP_DBUS,
-                                          DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS,
+  message = dbus_message_new_method_call (DBUS_SERVICE_DBUS,
+                                          DBUS_PATH_DBUS,
+                                          DBUS_INTERFACE_DBUS,
                                           "StartServiceByName");
 
   if (message == NULL)
@@ -2676,7 +2676,7 @@ check_segfault_service_no_auto_start (BusContext     *context,
 
   if (dbus_message_get_type (message) == DBUS_MESSAGE_TYPE_ERROR)
     {
-      if (!dbus_message_has_sender (message, DBUS_SERVICE_ORG_FREEDESKTOP_DBUS))
+      if (!dbus_message_has_sender (message, DBUS_SERVICE_DBUS))
         {
           _dbus_warn ("Message has wrong sender %s\n",
                       dbus_message_get_sender (message) ?
@@ -2769,7 +2769,7 @@ check_segfault_service_auto_start (BusContext     *context,
 
   if (dbus_message_get_type (message) == DBUS_MESSAGE_TYPE_ERROR)
     {
-      if (!dbus_message_has_sender (message, DBUS_SERVICE_ORG_FREEDESKTOP_DBUS))
+      if (!dbus_message_has_sender (message, DBUS_SERVICE_DBUS))
         {
           _dbus_warn ("Message has wrong sender %s\n",
                       dbus_message_get_sender (message) ?
diff --git a/bus/driver.c b/bus/driver.c
index 9c1a47c7..25ce0f94 100644
--- a/bus/driver.c
+++ b/bus/driver.c
@@ -57,8 +57,8 @@ bus_driver_send_service_owner_changed (const char     *service_name,
                  old_owner ? old_owner : null_service, 
                  new_owner ? new_owner : null_service);
 
-  message = dbus_message_new_signal (DBUS_PATH_ORG_FREEDESKTOP_DBUS,
-                                     DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS,
+  message = dbus_message_new_signal (DBUS_PATH_DBUS,
+                                     DBUS_INTERFACE_DBUS,
                                      "NameOwnerChanged");
   
   if (message == NULL)
@@ -67,7 +67,7 @@ bus_driver_send_service_owner_changed (const char     *service_name,
       return FALSE;
     }
   
-  if (!dbus_message_set_sender (message, DBUS_SERVICE_ORG_FREEDESKTOP_DBUS))
+  if (!dbus_message_set_sender (message, DBUS_SERVICE_DBUS))
     goto oom;
 
   if (!dbus_message_append_args (message,
@@ -100,8 +100,8 @@ bus_driver_send_service_lost (DBusConnection *connection,
 
   _DBUS_ASSERT_ERROR_IS_CLEAR (error);
   
-  message = dbus_message_new_signal (DBUS_PATH_ORG_FREEDESKTOP_DBUS,
-                                     DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS,
+  message = dbus_message_new_signal (DBUS_PATH_DBUS,
+                                     DBUS_INTERFACE_DBUS,
                                      "NameLost");
   
   if (message == NULL)
@@ -143,8 +143,8 @@ bus_driver_send_service_acquired (DBusConnection *connection,
 
   _DBUS_ASSERT_ERROR_IS_CLEAR (error);
   
-  message = dbus_message_new_signal (DBUS_PATH_ORG_FREEDESKTOP_DBUS,
-                                     DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS,
+  message = dbus_message_new_signal (DBUS_PATH_DBUS,
+                                     DBUS_INTERFACE_DBUS,
                                      "NameAcquired");
 
   if (message == NULL)
@@ -411,7 +411,7 @@ bus_driver_handle_list_services (DBusConnection *connection,
 
   {
     /* Include the bus driver in the list */
-    const char *v_STRING = DBUS_SERVICE_ORG_FREEDESKTOP_DBUS;
+    const char *v_STRING = DBUS_SERVICE_DBUS;
     if (!dbus_message_iter_append_basic (&sub, DBUS_TYPE_STRING,
                                          &v_STRING))
       {
@@ -548,7 +548,7 @@ bus_driver_handle_service_exists (DBusConnection *connection,
 
   retval = FALSE;
 
-  if (strcmp (name, DBUS_SERVICE_ORG_FREEDESKTOP_DBUS) == 0)
+  if (strcmp (name, DBUS_SERVICE_DBUS) == 0)
     {
       service_exists = TRUE;
     }
@@ -806,10 +806,10 @@ bus_driver_handle_get_service_owner (DBusConnection *connection,
   _dbus_string_init_const (&str, text);
   service = bus_registry_lookup (registry, &str);
   if (service == NULL &&
-      _dbus_string_equal_c_str (&str, DBUS_SERVICE_ORG_FREEDESKTOP_DBUS))
+      _dbus_string_equal_c_str (&str, DBUS_SERVICE_DBUS))
     {
       /* ORG_FREEDESKTOP_DBUS owns itself */
-      base_name = DBUS_SERVICE_ORG_FREEDESKTOP_DBUS;
+      base_name = DBUS_SERVICE_DBUS;
     }
   else if (service == NULL)
     {
@@ -1132,7 +1132,7 @@ bus_driver_handle_introspect (DBusConnection *connection,
     goto oom;
   if (!_dbus_string_append (&xml, "<node>\n"))
     goto oom;
-  if (!_dbus_string_append (&xml, "  <interface name=\"org.freedesktop.Introspectable\">\n"))
+  if (!_dbus_string_append_printf (&xml, "  <interface name=\"%s\">\n", DBUS_INTERFACE_INTROSPECTABLE))
     goto oom;
   if (!_dbus_string_append (&xml, "    <method name=\"Introspect\">\n"))
     goto oom;
@@ -1144,7 +1144,7 @@ bus_driver_handle_introspect (DBusConnection *connection,
     goto oom;
 
   if (!_dbus_string_append_printf (&xml, "  <interface name=\"%s\">\n",
-                                   DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS))
+                                   DBUS_INTERFACE_DBUS))
     goto oom;
 
   i = 0;
@@ -1274,13 +1274,13 @@ bus_driver_handle_message (DBusConnection *connection,
     }
 
   if (dbus_message_is_method_call (message,
-                                   DBUS_INTERFACE_ORG_FREEDESKTOP_INTROSPECTABLE,
+                                   DBUS_INTERFACE_INTROSPECTABLE,
                                    "Introspect"))
     return bus_driver_handle_introspect (connection, transaction, message, error);
   
   interface = dbus_message_get_interface (message);
   if (interface == NULL)
-    interface = DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS;
+    interface = DBUS_INTERFACE_DBUS;
   
   _dbus_assert (dbus_message_get_member (message) != NULL);
   
@@ -1288,7 +1288,7 @@ bus_driver_handle_message (DBusConnection *connection,
   sender = dbus_message_get_sender (message);
   
   if (strcmp (interface,
-              DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS) != 0)
+              DBUS_INTERFACE_DBUS) != 0)
     {
       _dbus_verbose ("Driver got message to unknown interface \"%s\"\n",
                      interface);
@@ -1346,7 +1346,7 @@ bus_driver_handle_message (DBusConnection *connection,
 
   dbus_set_error (error, DBUS_ERROR_UNKNOWN_METHOD,
                   "%s does not understand message %s",
-                  DBUS_SERVICE_ORG_FREEDESKTOP_DBUS, name);
+                  DBUS_SERVICE_DBUS, name);
   
   return FALSE;
 }
diff --git a/bus/signals.c b/bus/signals.c
index eedeff6f..e4e43c34 100644
--- a/bus/signals.c
+++ b/bus/signals.c
@@ -1130,7 +1130,7 @@ match_rule_matches (BusMatchRule    *rule,
       if (sender == NULL)
         {
           if (strcmp (rule->sender,
-                      DBUS_SERVICE_ORG_FREEDESKTOP_DBUS) != 0)
+                      DBUS_SERVICE_DBUS) != 0)
             return FALSE;
         }
       else
@@ -1153,7 +1153,7 @@ match_rule_matches (BusMatchRule    *rule,
       if (addressed_recipient == NULL)
         {          
           if (strcmp (rule->destination,
-                      DBUS_SERVICE_ORG_FREEDESKTOP_DBUS) != 0)
+                      DBUS_SERVICE_DBUS) != 0)
             return FALSE;
         }
       else
diff --git a/bus/test.c b/bus/test.c
index 90d044ec..599e7caf 100644
--- a/bus/test.c
+++ b/bus/test.c
@@ -107,7 +107,7 @@ client_disconnect_filter (DBusConnection     *connection,
                           void               *user_data)
 {
   if (!dbus_message_is_signal (message,
-                               DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL,
+                               DBUS_INTERFACE_LOCAL,
                                "Disconnected"))
     return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;