diff --git a/docs/reference/gio/overview.xml b/docs/reference/gio/overview.xml
index 7817ab60f..b44228586 100644
--- a/docs/reference/gio/overview.xml
+++ b/docs/reference/gio/overview.xml
@@ -370,7 +370,7 @@ Gvfs is also heavily distributed and relies on a session bus to be present.
         The #GVfs implementation for local files that is included in GIO
         has the name "local", the implementation in the gvfs module has
         the name "gvfs".  Most commonly, system software will set this to "local"
-	to avoid having `GFile` APIs perform unnecessary DBus calls.
+        to avoid having `GFile` APIs perform unnecessary D-Bus calls.
       </para><para>
         The special value <literal>help</literal> can be used to print a list of
         available implementations to standard output.
diff --git a/docs/reference/glib/gvariant-varargs.xml b/docs/reference/glib/gvariant-varargs.xml
index 8529a28aa..cd9002ca5 100644
--- a/docs/reference/glib/gvariant-varargs.xml
+++ b/docs/reference/glib/gvariant-varargs.xml
@@ -532,8 +532,8 @@ value4 = g_variant_new ("x", G_GINT64_CONSTANT (998877665544332211));
     <link linkend='gchar'>gchar</link> *)</code> and makes a copy of it.
     <link linkend='NULL:CAPS'><literal>NULL</literal></link> is not a valid string; use
     <link linkend='gvariant-format-strings-maybe-types'>maybe types</link> to encode that.  If the '<literal>o</literal>' or
-    '<literal>g</literal>' characters are used, care must be taken to ensure that the passed string is a valid DBus
-    object path or DBus type signature, respectively.
+    '<literal>g</literal>' characters are used, care must be taken to ensure that the passed string is a valid D-Bus
+    object path or D-Bus type signature, respectively.
    </para>
    <para>
     Upon encounting '<literal>s</literal>', '<literal>o</literal>' or '<literal>g</literal>', <link
diff --git a/gio/gapplicationcommandline.c b/gio/gapplicationcommandline.c
index d6c5c45fa..d5dd55c19 100644
--- a/gio/gapplicationcommandline.c
+++ b/gio/gapplicationcommandline.c
@@ -523,7 +523,7 @@ g_application_command_line_get_options_dict (GApplicationCommandLine *cmdline)
  * The #GInputStream can be used to read data passed to the standard
  * input of the invoking process.
  * This doesn't work on all platforms.  Presently, it is only available
- * on UNIX when using a DBus daemon capable of passing file descriptors.
+ * on UNIX when using a D-Bus daemon capable of passing file descriptors.
  * If stdin is not available then %NULL will be returned.  In the
  * future, support may be expanded to other platforms.
  *
diff --git a/gio/gapplicationimpl-dbus.c b/gio/gapplicationimpl-dbus.c
index fd9d0468d..6f02788a2 100644
--- a/gio/gapplicationimpl-dbus.c
+++ b/gio/gapplicationimpl-dbus.c
@@ -43,7 +43,7 @@
 #include "gunixfdlist.h"
 #endif
 
-/* DBus Interface definition {{{1 */
+/* D-Bus Interface definition {{{1 */
 
 /* For documentation of these interfaces, see
  * https://wiki.gnome.org/Projects/GLib/GApplication/DBusAPI
@@ -640,7 +640,7 @@ g_application_impl_register (GApplication        *application,
 
   /* We are non-primary.  Try to get the primary's list of actions.
    * This also serves as a mechanism to ensure that the primary exists
-   * (ie: DBus service files installed correctly, etc).
+   * (ie: D-Bus service files installed correctly, etc).
    */
   actions = g_dbus_action_group_get (impl->session_bus, impl->bus_name, impl->object_path);
   if (!g_dbus_action_group_sync (actions, cancellable, error))
diff --git a/gio/gdbusserver.c b/gio/gdbusserver.c
index 4a8dab0ea..9009734d5 100644
--- a/gio/gdbusserver.c
+++ b/gio/gdbusserver.c
@@ -71,7 +71,7 @@
  * To just export an object on a well-known name on a message bus, such as the
  * session or system bus, you should instead use g_bus_own_name().
  *
- * An example of peer-to-peer communication with G-DBus can be found
+ * An example of peer-to-peer communication with GDBus can be found
  * in [gdbus-example-peer.c](https://git.gnome.org/browse/glib/tree/gio/tests/gdbus-example-peer.c).
  *
  * Note that a minimal #GDBusServer will accept connections from any
diff --git a/glib/gvariant-serialiser.c b/glib/gvariant-serialiser.c
index 83e9d85b8..06f419fe4 100644
--- a/glib/gvariant-serialiser.c
+++ b/glib/gvariant-serialiser.c
@@ -1666,7 +1666,7 @@ g_variant_serialiser_is_string (gconstpointer data,
  *
  * Performs the checks for being a valid string.
  *
- * Also, ensures that @data is a valid DBus object path, as per the D-Bus
+ * Also, ensures that @data is a valid D-Bus object path, as per the D-Bus
  * specification.
  */
 gboolean
diff --git a/glib/gvariant.c b/glib/gvariant.c
index 6b460d843..039f35590 100644
--- a/glib/gvariant.c
+++ b/glib/gvariant.c
@@ -49,7 +49,7 @@
  * its type nor its content can be modified further.
  *
  * GVariant is useful whenever data needs to be serialized, for example when
- * sending method parameters in DBus, or when saving settings using GSettings.
+ * sending method parameters in D-Bus, or when saving settings using GSettings.
  *
  * When creating a new #GVariant, you pass the data you want to store in it
  * along with a string representing the type of data you wish to pass to it.
diff --git a/glib/gvarianttype.c b/glib/gvarianttype.c
index c46f1a2c6..831fed4bf 100644
--- a/glib/gvarianttype.c
+++ b/glib/gvarianttype.c
@@ -62,7 +62,7 @@
  *
  * Just as in D-Bus, GVariant types are described with strings ("type
  * strings").  Subject to the differences mentioned above, these strings
- * are of the same form as those found in DBus.  Note, however: D-Bus
+ * are of the same form as those found in D-Bus.  Note, however: D-Bus
  * always works in terms of messages and therefore individual type
  * strings appear nowhere in its interface.  Instead, "signatures"
  * are a concatenation of the strings of the type of each argument in a