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.

27 files changed, 184 insertions, 160 deletions

diff --git a/ChangeLog b/ChangeLog
index d418aee23..2798acbc8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,29 @@
 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.
+
+2005-02-17  Colin Walters  <walters@verbum.org>
+
 	* glib/dbus-gparser.c (struct Parser): Add in_annotation boolean.
 	(parse_node, parse_interface, parse_method, parse_signal)
 	(parse_property, parse_annotation): Lose if we're currently in an
diff --git a/bus/bus.c b/bus/bus.c
index a80636b1b..cd2a0401f 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 474a33759..d11621aee 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 96115b1cb..0803843e8 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 9c1a47c7c..25ce0f948 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 eedeff6f3..e4e43c34e 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 90d044ec1..599e7caf4 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;
     
diff --git a/dbus/dbus-bus.c b/dbus/dbus-bus.c
index 92e9f9639..188418c21 100644
--- a/dbus/dbus-bus.c
+++ b/dbus/dbus-bus.c
@@ -453,9 +453,9 @@ dbus_bus_register (DBusConnection *connection,
       return TRUE;
     }
   
-  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)
@@ -568,9 +568,9 @@ dbus_bus_get_unix_user (DBusConnection *connection,
   _dbus_return_val_if_fail (_dbus_check_is_valid_bus_name (name), DBUS_UID_UNSET);
   _dbus_return_val_if_error_is_set (error, DBUS_UID_UNSET);
   
-  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)
@@ -650,9 +650,9 @@ dbus_bus_request_name (DBusConnection *connection,
   _dbus_return_val_if_fail (_dbus_check_is_valid_bus_name (name), 0);
   _dbus_return_val_if_error_is_set (error, 0);
   
-  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,
                                           "RequestName");
 
   if (message == NULL)
@@ -724,9 +724,9 @@ dbus_bus_name_has_owner (DBusConnection *connection,
   _dbus_return_val_if_fail (_dbus_check_is_valid_bus_name (name), FALSE);
   _dbus_return_val_if_error_is_set (error, FALSE);
   
-  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,
                                           "NameHasOwner");
   if (message == NULL)
     {
@@ -793,9 +793,9 @@ dbus_bus_start_service_by_name (DBusConnection *connection,
   _dbus_return_val_if_fail (connection != NULL, FALSE);
   _dbus_return_val_if_fail (_dbus_check_is_valid_bus_name (name), FALSE);
   
-  msg = dbus_message_new_method_call (DBUS_SERVICE_ORG_FREEDESKTOP_DBUS,
-                                      DBUS_PATH_ORG_FREEDESKTOP_DBUS,
-                                      DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS,
+  msg = dbus_message_new_method_call (DBUS_SERVICE_DBUS,
+                                      DBUS_PATH_DBUS,
+                                      DBUS_INTERFACE_DBUS,
                                       "StartServiceByName");
 
   if (!dbus_message_append_args (msg, DBUS_TYPE_STRING, &name,
@@ -893,9 +893,9 @@ dbus_bus_add_match (DBusConnection *connection,
 
   _dbus_return_if_fail (rule != NULL);
 
-  msg = dbus_message_new_method_call (DBUS_SERVICE_ORG_FREEDESKTOP_DBUS,
-                                      DBUS_PATH_ORG_FREEDESKTOP_DBUS,
-                                      DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS,
+  msg = dbus_message_new_method_call (DBUS_SERVICE_DBUS,
+                                      DBUS_PATH_DBUS,
+                                      DBUS_INTERFACE_DBUS,
                                       "AddMatch");
 
   if (msg == NULL)
@@ -939,9 +939,9 @@ dbus_bus_remove_match (DBusConnection *connection,
 
   _dbus_return_if_fail (rule != NULL);
   
-  msg = dbus_message_new_method_call (DBUS_SERVICE_ORG_FREEDESKTOP_DBUS,
-                                      DBUS_PATH_ORG_FREEDESKTOP_DBUS,
-                                      DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS,
+  msg = dbus_message_new_method_call (DBUS_SERVICE_DBUS,
+                                      DBUS_PATH_DBUS,
+                                      DBUS_INTERFACE_DBUS,
                                       "RemoveMatch");
 
   if (!dbus_message_append_args (msg, DBUS_TYPE_STRING, &rule,
diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c
index 628f7a19e..ae83af69c 100644
--- a/dbus/dbus-connection.c
+++ b/dbus/dbus-connection.c
@@ -124,8 +124,8 @@
  *
  * When a connection is disconnected, you are guaranteed to get a
  * signal "Disconnected" from the interface
- * #DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL, path
- * #DBUS_PATH_ORG_FREEDESKTOP_LOCAL.
+ * #DBUS_INTERFACE_LOCAL, path
+ * #DBUS_PATH_LOCAL.
  *
  * You may not drop the last reference to a #DBusConnection
  * until that connection has been disconnected.
@@ -1137,8 +1137,8 @@ _dbus_connection_new_for_transport (DBusTransport *transport)
   if (io_path_cond == NULL)
     goto error;
 
-  disconnect_message = dbus_message_new_signal (DBUS_PATH_ORG_FREEDESKTOP_LOCAL,
-                                                DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL,
+  disconnect_message = dbus_message_new_signal (DBUS_PATH_LOCAL,
+                                                DBUS_INTERFACE_LOCAL,
                                                 "Disconnected");
   
   if (disconnect_message == NULL)
@@ -3214,7 +3214,7 @@ dbus_connection_dispatch (DBusConnection *connection)
       
       if (connection->exit_on_disconnect &&
           dbus_message_is_signal (message,
-                                  DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL,
+                                  DBUS_INTERFACE_LOCAL,
                                   "Disconnected"))
         {
           _dbus_verbose ("Exiting on Disconnected signal\n");
diff --git a/dbus/dbus-marshal-header.c b/dbus/dbus-marshal-header.c
index 10d9e20b6..cd6f89503 100644
--- a/dbus/dbus-marshal-header.c
+++ b/dbus/dbus-marshal-header.c
@@ -37,9 +37,9 @@
 /** Static #DBusString containing the signature of a message header */
 _DBUS_STRING_DEFINE_STATIC(_dbus_header_signature_str, DBUS_HEADER_SIGNATURE);
 /** Static #DBusString containing the local interface */
-_DBUS_STRING_DEFINE_STATIC(_dbus_local_interface_str,  DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL);
+_DBUS_STRING_DEFINE_STATIC(_dbus_local_interface_str,  DBUS_INTERFACE_LOCAL);
 /** Static #DBusString containing the local path */
-_DBUS_STRING_DEFINE_STATIC(_dbus_local_path_str,       DBUS_PATH_ORG_FREEDESKTOP_LOCAL);
+_DBUS_STRING_DEFINE_STATIC(_dbus_local_path_str,       DBUS_PATH_LOCAL);
 
 /** Offset from start of _dbus_header_signature_str to the signature of the fields array */
 #define FIELDS_ARRAY_SIGNATURE_OFFSET 6
diff --git a/dbus/dbus-message-factory.c b/dbus/dbus-message-factory.c
index 39df92f2a..984b69d97 100644
--- a/dbus/dbus-message-factory.c
+++ b/dbus/dbus-message-factory.c
@@ -557,7 +557,7 @@ generate_special (DBusMessageDataIter   *iter,
     {
       message = simple_method_call ();
 
-      if (!dbus_message_set_interface (message, DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL))
+      if (!dbus_message_set_interface (message, DBUS_INTERFACE_LOCAL))
         _dbus_assert_not_reached ("oom");
       
       generate_from_message (data, expected_validity, message);
@@ -568,7 +568,7 @@ generate_special (DBusMessageDataIter   *iter,
     {
       message = simple_method_call ();
 
-      if (!dbus_message_set_path (message, DBUS_PATH_ORG_FREEDESKTOP_LOCAL))
+      if (!dbus_message_set_path (message, DBUS_PATH_LOCAL))
         _dbus_assert_not_reached ("oom");
       
       generate_from_message (data, expected_validity, message);
diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c
index 71861689d..dfe3b02b4 100644
--- a/dbus/dbus-message.c
+++ b/dbus/dbus-message.c
@@ -2853,7 +2853,7 @@ dbus_message_has_destination (DBusMessage  *message,
  * unique name of the connection as the sender. So you can't use this
  * function to see whether a sender owned a well-known name.
  *
- * Messages from the bus itself will have #DBUS_SERVICE_ORG_FREEDESKTOP_DBUS
+ * Messages from the bus itself will have #DBUS_SERVICE_DBUS
  * as the sender.
  *
  * @param message the message
diff --git a/dbus/dbus-object-tree.c b/dbus/dbus-object-tree.c
index b693b919d..87624f5dc 100644
--- a/dbus/dbus-object-tree.c
+++ b/dbus/dbus-object-tree.c
@@ -630,7 +630,7 @@ handle_default_introspect_and_unlock (DBusObjectTree          *tree,
   reply = NULL;
   
   if (!dbus_message_is_method_call (message,
-                                    DBUS_INTERFACE_ORG_FREEDESKTOP_INTROSPECTABLE,
+                                    DBUS_INTERFACE_INTROSPECTABLE,
                                     "Introspect"))
     {
 #ifdef DBUS_BUILD_TESTS
diff --git a/dbus/dbus-protocol.h b/dbus/dbus-protocol.h
index c662d7210..d48c3e84b 100644
--- a/dbus/dbus-protocol.h
+++ b/dbus/dbus-protocol.h
@@ -203,25 +203,25 @@ extern "C" {
 #define DBUS_MINIMUM_HEADER_SIZE 16
 
 /* Services */
-#define DBUS_SERVICE_ORG_FREEDESKTOP_DBUS      "org.freedesktop.DBus"
+#define DBUS_SERVICE_DBUS      "org.freedesktop.DBus"
 
 /* Paths */
-#define DBUS_PATH_ORG_FREEDESKTOP_DBUS  "/org/freedesktop/DBus"
-#define DBUS_PATH_ORG_FREEDESKTOP_LOCAL "/org/freedesktop/Local"
+#define DBUS_PATH_DBUS  "/org/freedesktop/DBus"
+#define DBUS_PATH_LOCAL "/org/freedesktop/DBus/Local"
 
 /* Interfaces, these #define don't do much other than
  * catch typos at compile time
  */
-#define DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS           "org.freedesktop.DBus"
-#define DBUS_INTERFACE_ORG_FREEDESKTOP_INTROSPECTABLE "org.freedesktop.Introspectable"
-#define DBUS_INTERFACE_ORG_FREEDESKTOP_PROPERTIES     "org.freedesktop.Properties"
-#define DBUS_INTERFACE_ORG_FREEDESKTOP_PEER           "org.freedesktop.Peer"
+#define DBUS_INTERFACE_DBUS           "org.freedesktop.DBus"
+#define DBUS_INTERFACE_INTROSPECTABLE "org.freedesktop.DBus.Introspectable"
+#define DBUS_INTERFACE_PROPERTIES     "org.freedesktop.DBus.Properties"
+#define DBUS_INTERFACE_PEER           "org.freedesktop.DBus.Peer"
 
 /* This is a special interface whose methods can only be invoked
  * by the local implementation (messages from remote apps aren't
  * allowed to specify this interface).
  */
-#define DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL "org.freedesktop.Local"
+#define DBUS_INTERFACE_LOCAL "org.freedesktop.DBus.Local"
 
 /* Owner flags */
 #define DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT 0x1
diff --git a/doc/dbus-faq.xml b/doc/dbus-faq.xml
index b197297ed..a233a2122 100644
--- a/doc/dbus-faq.xml
+++ b/doc/dbus-faq.xml
@@ -123,7 +123,7 @@
           generic <literal>TextEditor</literal>), have multiple objects (maybe
           <literal>/org/kde/documents/4352</literal> where the number changes
           according to the document), and each object could implement multiple
-          interfaces, such as <literal>org.freedesktop.Introspectable</literal>,
+          interfaces, such as <literal>org.freedesktop.DBus.Introspectable</literal>,
           <literal>org.freedesktop.BasicTextField</literal>,
           <literal>org.kde.RichTextDocument</literal>.
         </para>
diff --git a/doc/dbus-specification.xml b/doc/dbus-specification.xml
index ad21af626..74df3b33f 100644
--- a/doc/dbus-specification.xml
+++ b/doc/dbus-specification.xml
@@ -2208,17 +2208,17 @@
       that may be useful across various D-BUS applications.
     </para>
     <sect2 id="standard-interfaces-peer">
-      <title><literal>org.freedesktop.Peer</literal></title>
+      <title><literal>org.freedesktop.DBus.Peer</literal></title>
       <para>
-        The <literal>org.freedesktop.Peer</literal> interface 
+        The <literal>org.freedesktop.DBus.Peer</literal> interface 
         has one method:
         <programlisting>
-          org.freedesktop.Peer.Ping ()
+          org.freedesktop.DBus.Peer.Ping ()
         </programlisting>
       </para>
       <para>
         On receipt of the <literal>METHOD_CALL</literal> message
-        <literal>org.freedesktop.Peer.Ping</literal>, an application should do
+        <literal>org.freedesktop.DBus.Peer.Ping</literal>, an application should do
         nothing other than reply with a <literal>METHOD_RETURN</literal> as
         usual.  It does not matter which object path a ping is sent to.  The
         reference implementation should simply handle this method on behalf of
@@ -2228,11 +2228,11 @@
     </sect2>
 
     <sect2 id="standard-interfaces-introspectable">
-      <title><literal>org.freedesktop.Introspectable</literal></title>
+      <title><literal>org.freedesktop.DBus.Introspectable</literal></title>
       <para>
         This interface has one method:
         <programlisting>
-          org.freedesktop.Introspectable.Introspect (out STRING xml_data)
+          org.freedesktop.DBus.Introspectable.Introspect (out STRING xml_data)
         </programlisting>
       </para>
       <para>
@@ -2246,25 +2246,25 @@
       </para>
     </sect2>
     <sect2 id="standard-interfaces-properties">
-      <title><literal>org.freedesktop.Properties</literal></title>
+      <title><literal>org.freedesktop.DBus.Properties</literal></title>
       <para>
         Many native APIs will have a concept of object <firstterm>properties</firstterm> 
         or <firstterm>attributes</firstterm>. These can be exposed via the 
-        <literal>org.freedesktop.Properties</literal> interface.
+        <literal>org.freedesktop.DBus.Properties</literal> interface.
       </para>
       <para>
         <programlisting>
-              org.freedesktop.Properties.Get (in STRING interface_name,
-                                              in STRING property_name,
-                                              out VARIANT value);
-              org.freedesktop.Properties.Set (in STRING interface_name,
-                                              in STRING property_name,
-                                              in VARIANT value);
+              org.freedesktop.DBus.Properties.Get (in STRING interface_name,
+                                                   in STRING property_name,
+                                                   out VARIANT value);
+              org.freedesktop.DBus.Properties.Set (in STRING interface_name,
+                                                   in STRING property_name,
+                                                   in VARIANT value);
         </programlisting>
       </para>
       <para>
         The available properties and whether they are writable can be determined
-        by calling <literal>org.freedesktop.Introspectable.Introspect</literal>,
+        by calling <literal>org.freedesktop.DBus.Introspectable.Introspect</literal>,
         see <xref linkend="standard-interfaces-introspectable"/>.
       </para>
       <para>
@@ -2460,14 +2460,14 @@
         <literal>DESTINATION</literal> field is absent, the call is taken to be
         a standard one-to-one message and interpreted by the message bus
         itself. For example, sending an
-        <literal>org.freedesktop.Peer.Ping</literal> message with no
+        <literal>org.freedesktop.DBus.Peer.Ping</literal> message with no
         <literal>DESTINATION</literal> will cause the message bus itself to
         reply to the ping immediately; the message bus will not make this
         message visible to other applications.
       </para>
 
       <para>
-        Continuing the <literal>org.freedesktop.Peer.Ping</literal> example, if
+        Continuing the <literal>org.freedesktop.DBus.Peer.Ping</literal> example, if
         the ping message were sent with a <literal>DESTINATION</literal> name of
         <literal>com.yoyodyne.Screensaver</literal>, then the ping would be
         forwarded, and the Yoyodyne Corporation screensaver application would be
diff --git a/glib/dbus-gobject.c b/glib/dbus-gobject.c
index 3bcd90d5f..96eec473b 100644
--- a/glib/dbus-gobject.c
+++ b/glib/dbus-gobject.c
@@ -535,14 +535,14 @@ handle_introspect (DBusConnection *connection,
   g_string_append (xml, "<node>\n");
 
   /* We are introspectable, though I guess that was pretty obvious */
-  g_string_append (xml, "  <interface name=\"org.freedesktop.Introspectable\">\n");
+  g_string_append_printf (xml, "  <interface name=\"%s\">\n", DBUS_INTERFACE_INTROSPECTABLE);
   g_string_append (xml, "    <method name=\"Introspect\">\n");
   g_string_append (xml, "      <arg name=\"data\" direction=\"out\" type=\"string\"/>\n");
   g_string_append (xml, "    </method>\n");
   g_string_append (xml, "  </interface>\n");
 
   /* We support get/set properties */
-  g_string_append (xml, "  <interface name=\"org.freedesktop.Properties\">\n");
+  g_string_append_printf (xml, "  <interface name=\"%s\">\n", DBUS_INTERFACE_PROPERTIES);
   g_string_append (xml, "    <method name=\"Get\">\n");
   g_string_append (xml, "      <arg name=\"interface\" direction=\"in\" type=\"string\"/>\n");
   g_string_append (xml, "      <arg name=\"propname\" direction=\"in\" type=\"string\"/>\n");
@@ -945,7 +945,7 @@ gobject_message_function (DBusConnection  *connection,
   object = G_OBJECT (user_data);
 
   if (dbus_message_is_method_call (message,
-                                   DBUS_INTERFACE_ORG_FREEDESKTOP_INTROSPECTABLE,
+                                   DBUS_INTERFACE_INTROSPECTABLE,
                                    "Introspect"))
     return handle_introspect (connection, message, object);
   
@@ -959,11 +959,11 @@ gobject_message_function (DBusConnection  *connection,
   getter = FALSE;
   setter = FALSE;
   if (dbus_message_is_method_call (message,
-                                   DBUS_INTERFACE_ORG_FREEDESKTOP_PROPERTIES,
+                                   DBUS_INTERFACE_PROPERTIES,
                                    "Get"))
     getter = TRUE;
   else if (dbus_message_is_method_call (message,
-                                        DBUS_INTERFACE_ORG_FREEDESKTOP_PROPERTIES,
+                                        DBUS_INTERFACE_PROPERTIES,
                                         "Set"))
     setter = TRUE;
 
diff --git a/glib/dbus-gproxy.c b/glib/dbus-gproxy.c
index 364facf8e..8967ccd22 100644
--- a/glib/dbus-gproxy.c
+++ b/glib/dbus-gproxy.c
@@ -580,7 +580,7 @@ dbus_g_proxy_manager_filter (DBusConnection    *connection,
   LOCK_MANAGER (manager);
   
   if (dbus_message_is_signal (message,
-                              DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL,
+                              DBUS_INTERFACE_LOCAL,
                               "Disconnected"))
     {
       /* Destroy all the proxies, quite possibly resulting in unreferencing
@@ -1153,9 +1153,9 @@ dbus_g_proxy_new_for_name_owner (DBusGConnection          *connection,
   unique_name = NULL;
   reply = NULL;
 
-  request = dbus_message_new_method_call (DBUS_SERVICE_ORG_FREEDESKTOP_DBUS,
-					  DBUS_PATH_ORG_FREEDESKTOP_DBUS,
-					  DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS,
+  request = dbus_message_new_method_call (DBUS_SERVICE_DBUS,
+					  DBUS_PATH_DBUS,
+					  DBUS_INTERFACE_DBUS,
 					  "GetNameOwner");
   if (request == NULL)
     g_error ("Out of memory");
diff --git a/test/data/invalid-messages/local-namespace.message b/test/data/invalid-messages/local-namespace.message
index f42b5c6ac..8a7201887 100644
--- a/test/data/invalid-messages/local-namespace.message
+++ b/test/data/invalid-messages/local-namespace.message
@@ -6,7 +6,7 @@ VALID_HEADER method_call
 
 HEADER_FIELD INTERFACE
 TYPE STRING
-STRING 'org.freedesktop.Local'
+STRING 'org.freedesktop.DBus.Local'
 HEADER_FIELD MEMBER
 TYPE STRING
 STRING 'Disconnected'
diff --git a/test/glib/test-dbus-glib.c b/test/glib/test-dbus-glib.c
index ca36af1f3..94ce4699a 100644
--- a/test/glib/test-dbus-glib.c
+++ b/test/glib/test-dbus-glib.c
@@ -67,9 +67,9 @@ main (int argc, char **argv)
   /* Create a proxy object for the "bus driver" */
   
   driver = dbus_g_proxy_new_for_name (connection,
-                                      DBUS_SERVICE_ORG_FREEDESKTOP_DBUS,
-                                      DBUS_PATH_ORG_FREEDESKTOP_DBUS,
-                                      DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS);
+                                      DBUS_SERVICE_DBUS,
+                                      DBUS_PATH_DBUS,
+                                      DBUS_INTERFACE_DBUS);
 
   /* Call ListNames method */
   
diff --git a/test/glib/test-profile.c b/test/glib/test-profile.c
index 25d4eebb3..ec0e4fd0d 100644
--- a/test/glib/test-profile.c
+++ b/test/glib/test-profile.c
@@ -143,7 +143,7 @@ with_or_without_bus_client_filter (DBusConnection     *connection,
                                    ClientData         *cd)
 {
   if (dbus_message_is_signal (message,
-                              DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL,
+                              DBUS_INTERFACE_LOCAL,
                               "Disconnected"))
     {
       g_printerr ("Client thread disconnected\n");
@@ -235,7 +235,7 @@ no_bus_server_filter (DBusConnection     *connection,
   ServerData *sd = user_data;
   
   if (dbus_message_is_signal (message,
-                              DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL,
+                              DBUS_INTERFACE_LOCAL,
                               "Disconnected"))
     {
       g_printerr ("Client disconnected from server\n");
@@ -411,16 +411,16 @@ with_bus_server_filter (DBusConnection     *connection,
   WithBusServer *server = user_data;
   
   if (dbus_message_is_signal (message,
-                              DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL,
+                              DBUS_INTERFACE_LOCAL,
                               "Disconnected"))
     {
       g_printerr ("Server disconnected from message bus\n");
       exit (1);
     }
   else if (dbus_message_has_sender (message,
-                                    DBUS_SERVICE_ORG_FREEDESKTOP_DBUS) &&
+                                    DBUS_SERVICE_DBUS) &&
            dbus_message_is_signal (message,
-                                   DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS,
+                                   DBUS_INTERFACE_DBUS,
                                    "NameOwnerChanged"))
     {
       const char *name, *old_owner, *new_owner;
@@ -528,7 +528,7 @@ with_bus_init_server (ServerData       *sd)
                          0, NULL); /* ignore errors because we suck */
   
   rule = g_strdup_printf ("type='signal',sender='%s',member='%s'",
-                          DBUS_SERVICE_ORG_FREEDESKTOP_DBUS,
+                          DBUS_SERVICE_DBUS,
                           "NameOwnerChanged");
 
   /* ignore errors because we suck */
diff --git a/test/glib/test-service-glib.c b/test/glib/test-service-glib.c
index 81cb556fd..a2e365895 100644
--- a/test/glib/test-service-glib.c
+++ b/test/glib/test-service-glib.c
@@ -227,9 +227,9 @@ main (int argc, char **argv)
                                        obj);
 
   driver_proxy = dbus_g_proxy_new_for_name (connection,
-                                            DBUS_SERVICE_ORG_FREEDESKTOP_DBUS,
-                                            DBUS_PATH_ORG_FREEDESKTOP_DBUS,
-                                            DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS);
+                                            DBUS_SERVICE_DBUS,
+                                            DBUS_PATH_DBUS,
+                                            DBUS_INTERFACE_DBUS);
 
   v_STRING = "org.freedesktop.DBus.TestSuiteGLibService";
   v_UINT32 = 0;
diff --git a/test/glib/test-thread-server.c b/test/glib/test-thread-server.c
index e61e3a6a5..9b683983d 100644
--- a/test/glib/test-thread-server.c
+++ b/test/glib/test-thread-server.c
@@ -131,7 +131,7 @@ filter_disconnect (DBusConnection     *connection,
                    DBusMessage        *message,
                    void               *user_data)
 {
-  if (!dbus_message_is_signal (message, DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL,
+  if (!dbus_message_is_signal (message, DBUS_INTERFACE_LOCAL,
                                "Disconnected"))
     return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 
diff --git a/test/test-service.c b/test/test-service.c
index 588ef01f5..9316b6265 100644
--- a/test/test-service.c
+++ b/test/test-service.c
@@ -143,7 +143,7 @@ filter_func (DBusConnection     *connection,
              void               *user_data)
 {
   if (dbus_message_is_signal (message,
-                              DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL,
+                              DBUS_INTERFACE_LOCAL,
                               "Disconnected"))
     {
       dbus_connection_disconnect (connection);
diff --git a/tools/dbus-monitor.c b/tools/dbus-monitor.c
index 0ae7570f2..fa9a9da67 100644
--- a/tools/dbus-monitor.c
+++ b/tools/dbus-monitor.c
@@ -35,7 +35,7 @@ filter_func (DBusConnection     *connection,
   print_message (message);
   
   if (dbus_message_is_signal (message,
-                              DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL,
+                              DBUS_INTERFACE_LOCAL,
                               "Disconnected"))
     exit (0);
   
diff --git a/tools/dbus-names-model.c b/tools/dbus-names-model.c
index 82016f2ff..ab83e5f2a 100644
--- a/tools/dbus-names-model.c
+++ b/tools/dbus-names-model.c
@@ -245,9 +245,9 @@ names_model_set_connection (NamesModel      *names_model,
       
       names_model->driver_proxy =
         dbus_g_proxy_new_for_name (names_model->connection,
-                                   DBUS_SERVICE_ORG_FREEDESKTOP_DBUS,
-                                   DBUS_PATH_ORG_FREEDESKTOP_DBUS,
-                                   DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS);
+                                   DBUS_SERVICE_DBUS,
+                                   DBUS_PATH_DBUS,
+                                   DBUS_INTERFACE_DBUS);
       g_assert (names_model->driver_proxy);
 
       dbus_g_proxy_add_signal (names_model->driver_proxy,
diff --git a/tools/dbus-viewer.c b/tools/dbus-viewer.c
index 338b8e054..e8ed54321 100644
--- a/tools/dbus-viewer.c
+++ b/tools/dbus-viewer.c
@@ -169,7 +169,7 @@ load_child_nodes (const char *service_name,
           proxy = dbus_g_proxy_new_for_name (connection,
                                              service_name,
                                              path->str,
-                                             DBUS_INTERFACE_ORG_FREEDESKTOP_INTROSPECTABLE);
+                                             DBUS_INTERFACE_INTROSPECTABLE);
           g_assert (proxy != NULL);
         }
       else
@@ -177,7 +177,7 @@ load_child_nodes (const char *service_name,
           proxy = dbus_g_proxy_new_for_name_owner (connection,
                                                    service_name,
                                                    path->str,
-                                                   DBUS_INTERFACE_ORG_FREEDESKTOP_INTROSPECTABLE,
+                                                   DBUS_INTERFACE_INTROSPECTABLE,
                                                    error);
           if (proxy == NULL)
             goto done;
@@ -283,14 +283,14 @@ load_from_service_thread_func (void *thread_data)
   root_proxy = dbus_g_proxy_new_for_name (lfsd->connection,
                                           lfsd->service_name,
                                           "/",
-                                          DBUS_INTERFACE_ORG_FREEDESKTOP_INTROSPECTABLE);
+                                          DBUS_INTERFACE_INTROSPECTABLE);
   g_assert (root_proxy != NULL);
 #else
   /* this will be an error if the service doesn't exist */
   root_proxy = dbus_g_proxy_new_for_name_owner (lfsd->connection,
                                                 lfsd->service_name,
                                                 "/",
-                                                DBUS_INTERFACE_ORG_FREEDESKTOP_INTROSPECTABLE,
+                                                DBUS_INTERFACE_INTROSPECTABLE,
                                                 &lfsd->error);
   if (root_proxy == NULL)
     {