diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 661c126ce2..4743e81f07 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -21,7 +21,7 @@ many things that we value:
 Please, do not use the issue tracker for support questions. If you have
 questions on how to use GTK effectively, you can use:
 
- - the `#gtk+` IRC channel on irc.gnome.org
+ - the `#gtk` IRC channel on irc.gnome.org
  - the [gtk](https://mail.gnome.org/mailman/listinfo/gtk-list) mailing list,
    for general questions on GTK
  - the [gtk-app-devel](https://mail.gnome.org/mailman/listinfo/gtk-app-devel-list)
@@ -245,7 +245,7 @@ people committing to GTK to follow a few rules:
    better way to do things. If you are making changes to GTK, you should
    be subscribed to the [gtk-devel](https://mail.gnome.org/mailman/listinfo/gtk-devel-list)
    mailing list; this is a good place to ask about intended changes.
-   The `#gtk+` IRC channel on irc.gnome.org is also a good place to find GTK
+   The `#gtk` IRC channel on irc.gnome.org is also a good place to find GTK
    developers to discuss changes, but if you live outside of the EU/US time
    zones, an email to the gtk-devel mailing list is the most certain and
    preferred method.
diff --git a/gdk/gdkkeysyms-update.pl b/gdk/gdkkeysyms-update.pl
index 7bf9314fdf..25d527e6cf 100755
--- a/gdk/gdkkeysyms-update.pl
+++ b/gdk/gdkkeysyms-update.pl
@@ -1,15 +1,15 @@
 #!/usr/bin/env perl
 
-# Updates http://git.gnome.org/browse/gtk+/tree/gdk/gdkkeysyms.h from upstream (X.org 7.x),
-# from http://cgit.freedesktop.org/xorg/proto/x11proto/plain/keysymdef.h
+# Updates https://gitlab.gnome.org/GNOME/gtk/tree/master/gdk/gdkkeysyms.h from upstream (X.org 7.x),
+# from https://cgit.freedesktop.org/xorg/proto/x11proto/plain/keysymdef.h
 # 
 # Author  : Simos Xenitellis <simos at gnome dot org>.
 # Author  : Bastien Nocera <hadess@hadess.net>
 # Version : 1.2
 #
-# Input   : http://cgit.freedesktop.org/xorg/proto/x11proto/plain/keysymdef.h
-# Input   : http://cgit.freedesktop.org/xorg/proto/x11proto/plain/XF86keysym.h
-# Output  : http://git.gnome.org/browse/gtk+/tree/gdk/gdkkeysyms.h
+# Input   : https://cgit.freedesktop.org/xorg/proto/x11proto/plain/keysymdef.h
+# Input   : https://cgit.freedesktop.org/xorg/proto/x11proto/plain/XF86keysym.h
+# Output  : https://gitlab.gnome.org/GNOME/gtk/tree/master/gdk/gdkkeysyms.h
 # 
 # Notes   : It downloads keysymdef.h from the Internet, if not found locally,
 # Notes   : and creates an updated gdkkeysyms.h
@@ -53,7 +53,7 @@ else
 # Source: http://cgit.freedesktop.org/xorg/proto/x11proto/plain/keysymdef.h
 die "Could not open file keysymdef.h: $!\n" unless open(IN_KEYSYMDEF, "<:utf8", "keysymdef.h");
 
-# Output: gtk+/gdk/gdkkeysyms.h
+# Output: gtk/gdk/gdkkeysyms.h
 die "Could not open file gdkkeysyms.h: $!\n" unless open(OUT_GDKKEYSYMS, ">:utf8", "gdkkeysyms.h");
 
 my $LICENSE_HEADER= <<EOF;
@@ -82,7 +82,7 @@ print OUT_GDKKEYSYMS $LICENSE_HEADER;
 print OUT_GDKKEYSYMS<<EOF;
 
 /*
- * File auto-generated from script http://git.gnome.org/browse/gtk+/tree/gdk/gdkkeysyms-update.pl
+ * File auto-generated from script https://gitlab.gnome.org/GNOME/gtk/tree/master/gdk/gdkkeysyms-update.pl
  * using the input file
  * http://cgit.freedesktop.org/xorg/proto/x11proto/plain/keysymdef.h
  * and
diff --git a/gdk/gdkkeysyms.h b/gdk/gdkkeysyms.h
index d2d6d07d7c..88fd1289f7 100644
--- a/gdk/gdkkeysyms.h
+++ b/gdk/gdkkeysyms.h
@@ -18,7 +18,7 @@
 
 
 /*
- * File auto-generated from script http://git.gnome.org/browse/gtk+/tree/gdk/gdkkeysyms-update.pl
+ * File auto-generated from script https://gitlab.gnome.org/GNOME/gtk/tree/master/gdk/gdkkeysyms-update.pl
  * using the input file
  * http://cgit.freedesktop.org/xorg/proto/x11proto/plain/keysymdef.h
  * and
diff --git a/gdk/wayland/gdkkeys-wayland.c b/gdk/wayland/gdkkeys-wayland.c
index 9a6809d23b..b1992057a0 100644
--- a/gdk/wayland/gdkkeys-wayland.c
+++ b/gdk/wayland/gdkkeys-wayland.c
@@ -304,9 +304,9 @@ get_gdk_modifiers (struct xkb_keymap *xkb_keymap,
     state |= GDK_SUPER_MASK;
   if (mods & (1 << xkb_keymap_mod_get_index (xkb_keymap, "Hyper")))
     state |= GDK_HYPER_MASK;
-  /* Gtk+ treats MOD1 as a synonym for Alt, and does not expect it to
+  /* GTK treats MOD1 as a synonym for Alt, and does not expect it to
    * be mapped around, so we should avoid adding GDK_META_MASK if MOD1
-   * is already included to avoid confusing gtk+ and applications that
+   * is already included to avoid confusing GTK and applications that
    * rely on that behavior.
    */
   if (mods & (1 << xkb_keymap_mod_get_index (xkb_keymap, "Meta")) &&
diff --git a/gtk/gtkapplication.c b/gtk/gtkapplication.c
index c4646dbd88..0ae1de11a1 100644
--- a/gtk/gtkapplication.c
+++ b/gtk/gtkapplication.c
@@ -106,7 +106,7 @@
  *
  * ## A simple application ## {#gtkapplication}
  *
- * [A simple example](https://git.gnome.org/browse/gtk+/tree/examples/bp/bloatpad.c)
+ * [A simple example](https://gitlab.gnome.org/GNOME/gtk/tree/master/examples/bp/bloatpad.c)
  *
  * GtkApplication optionally registers with a session manager
  * of the users session (if you set the #GtkApplication:register-session
diff --git a/gtk/gtkapplicationwindow.c b/gtk/gtkapplicationwindow.c
index 9651aedc05..3b09b97b66 100644
--- a/gtk/gtkapplicationwindow.c
+++ b/gtk/gtkapplicationwindow.c
@@ -104,7 +104,7 @@
  *
  * ## Handling fallback yourself
  *
- * [A simple example](https://git.gnome.org/browse/gtk+/tree/examples/sunny.c)
+ * [A simple example](https://gitlab.gnome.org/GNOME/gtk/tree/master/examples/sunny.c)
  *
  * The XML format understood by #GtkBuilder for #GMenuModel consists
  * of a toplevel `<menu>` element, which contains one or more `<item>`
diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c
index 55f16c0164..52244862ac 100644
--- a/gtk/gtkbuilder.c
+++ b/gtk/gtkbuilder.c
@@ -63,7 +63,7 @@
  * RELAX NG schema below. We refer to these descriptions as “GtkBuilder
  * UI definitions” or just “UI definitions” if the context is clear.
  *
- * [RELAX NG Compact Syntax](https://git.gnome.org/browse/gtk+/tree/gtk/gtkbuilder.rnc)
+ * [RELAX NG Compact Syntax](https://gitlab.gnome.org/GNOME/gtk/tree/master/gtk/gtkbuilder.rnc)
  *
  * The toplevel element is <interface>. It optionally takes a “domain”
  * attribute, which will make the builder look for translated strings
diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c
index 0a0f0a6540..3d41a1f233 100644
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -105,7 +105,7 @@
 #define ICON_SIZE	        16
 #define DEFAULT_TITLE		N_("Select a File")
 #define DESKTOP_DISPLAY_NAME	N_("Desktop")
-#define FALLBACK_DISPLAY_NAME	N_("(None)") /* this string is used in gtk+/gtk/tests/filechooser.c - change it there if you change it here */
+#define FALLBACK_DISPLAY_NAME	N_("(None)") /* this string is used in gtk/gtk/tests/filechooser.c - change it there if you change it here */
 
 
 /* ********************** *
diff --git a/gtk/gtksearchbar.c b/gtk/gtksearchbar.c
index 3e2b555669..93594d15f2 100644
--- a/gtk/gtksearchbar.c
+++ b/gtk/gtksearchbar.c
@@ -78,7 +78,7 @@
  *
  * ## Creating a search bar
  *
- * [A simple example](https://git.gnome.org/browse/gtk+/tree/examples/search-bar.c)
+ * [A simple example](https://gitlab.gnome.org/GNOME/gtk/tree/master/examples/search-bar.c)
  */
 
 typedef struct {
diff --git a/gtk/gtkshortcutswindow.c b/gtk/gtkshortcutswindow.c
index c9b55ef523..04fbe3be2d 100644
--- a/gtk/gtkshortcutswindow.c
+++ b/gtk/gtkshortcutswindow.c
@@ -72,7 +72,7 @@
  * are arranged in columns, and spread across several pages if there are too
  * many to find on a single page.
  *
- * The .ui file for this example can be found [here](https://git.gnome.org/browse/gtk+/tree/demos/gtk-demo/shortcuts-gedit.ui).
+ * The .ui file for this example can be found [here](https://gitlab.gnome.org/GNOME/gtk/tree/master/demos/gtk-demo/shortcuts-gedit.ui).
  *
  * # An example with multiple views:
  *
@@ -81,7 +81,7 @@
  * This example shows a #GtkShortcutsWindow that has been configured to show only
  * the shortcuts relevant to the "stopwatch" view.
  *
- * The .ui file for this example can be found [here](https://git.gnome.org/browse/gtk+/tree/demos/gtk-demo/shortcuts-clocks.ui).
+ * The .ui file for this example can be found [here](https://gitlab.gnome.org/GNOME/gtk/tree/master/demos/gtk-demo/shortcuts-clocks.ui).
  *
  * # An example with multiple sections:
  *
@@ -90,7 +90,7 @@
  * This example shows a #GtkShortcutsWindow with two sections, "Editor Shortcuts"
  * and "Terminal Shortcuts".
  *
- * The .ui file for this example can be found [here](https://git.gnome.org/browse/gtk+/tree/demos/gtk-demo/shortcuts-builder.ui).
+ * The .ui file for this example can be found [here](https://gitlab.gnome.org/GNOME/gtk/tree/master/demos/gtk-demo/shortcuts-builder.ui).
  */
 
 typedef struct
diff --git a/gtk/imwaylandgtk.c b/gtk/imwaylandgtk.c
index 1d5050496a..9556d5fa59 100644
--- a/gtk/imwaylandgtk.c
+++ b/gtk/imwaylandgtk.c
@@ -81,7 +81,7 @@ static const GtkIMContextInfo imwayland_info =
   "waylandgtk",      /* ID */
   NC_("input method menu", "Waylandgtk"),      /* Human readable name */
   GETTEXT_PACKAGE, /* Translation domain */
-  GTK_LOCALEDIR,   /* Dir for bindtextdomain (not strictly needed for "gtk+") */
+  GTK_LOCALEDIR,   /* Dir for bindtextdomain (not strictly needed for "gtk") */
   "",              /* Languages for which this module is the default */
 };