diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md
index 38dbd9e42ff675844fb0e6b91e5e8b3c617b380a..0d10a78b0410f240c27fee6be8f91983766e27aa 100644
--- a/.gitlab/issue_templates/Bug.md
+++ b/.gitlab/issue_templates/Bug.md
@@ -7,7 +7,7 @@ Bug report form
 
 ## Jami daemon version:
 
-<!-- type `/usr/lib/ring/dring -h` into your terminal -->
+<!-- type `/usr/libexec/jamid -h` into your terminal -->
 
 ## Jami GNOME client version:
 
@@ -19,7 +19,7 @@ Bug report form
 
 - [x] My OS package manager (e.g. apt, yum, pacman)
 - [ ] I downloaded it from jami.net
-- [ ] I built it from source using the make-ring.py script
+- [ ] I built it from source using the build.py script
 - [ ] I built it from source manually or other (please explain):
 
 ## Steps to reproduce bug
@@ -42,7 +42,7 @@ Steps:
 
 <!-- run
 
-journalctl --since "24h ago" | grep dring
+journalctl --since "24h ago" | grep jamid
 
 in your terminal -->
 
diff --git a/doc/jami-gnome.1 b/doc/jami-gnome.1
index e9504835869d5463a3387b8c9190daa2efacaf59..1cf3a5e00a6998798d0205c5fcf08a174b4775f8 100644
--- a/doc/jami-gnome.1
+++ b/doc/jami-gnome.1
@@ -19,6 +19,6 @@ Restores the hidden state of the main window. This is only applicable to the pri
 .B \-h, \-\-help
 Display help text and exit.
 .SH SEE ALSO
-dring(1)
+jamid(1)
 .SH AUTHOR
 Alexandre Viau (alexandre.viau@savoirfairelinux.net)
diff --git a/src/client.cpp b/src/client.cpp
index 3967cb086578471514d8b9b7f7b482c5a6b7e889..a27e71598581468f12970db407e07b724ce64501 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -111,7 +111,7 @@ exception_dialog(const char* msg)
     GtkWidget *dialog = gtk_message_dialog_new(NULL,
                             (GtkDialogFlags)(GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT),
                             GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
-                            _("Unable to initialize.\nMake sure the Jami daemon (dring) is running.\nError: %s"),
+                            _("Unable to initialize.\nMake sure the Jami daemon (jamid) is running.\nError: %s"),
                             msg);
 
     gtk_window_set_title(GTK_WINDOW(dialog), _("Jami Error"));
@@ -505,7 +505,7 @@ client_startup(GApplication *app)
     /* init libRingClient and make sure its connected to the dbus */
     try {
         priv->qtapp = new QCoreApplication(priv->argc, priv->argv);
-        /* the call model will try to connect to dring via dbus */
+        /* the call model will try to connect to jamid via dbus */
     } catch(const char * msg) {
         exception_dialog(msg);
         exit(1);
@@ -580,7 +580,7 @@ client_shutdown(GApplication *app)
     QObject::disconnect(priv->uam_updated);
 
     /* free the QCoreApplication, which will destroy all libRingClient models
-     * and thus send the Unregister signal over dbus to dring */
+     * and thus send the Unregister signal over dbus to jamid */
     if (priv->qtapp) {
         delete priv->qtapp;
         priv->qtapp = nullptr;
diff --git a/src/native/dbuserrorhandler.cpp b/src/native/dbuserrorhandler.cpp
index 0ab7dc074ce478d933e569556de84bbab79fe14d..3dccee5a9b80ec40515d1ca2b782285c6371a541 100644
--- a/src/native/dbuserrorhandler.cpp
+++ b/src/native/dbuserrorhandler.cpp
@@ -26,7 +26,7 @@
 namespace Interfaces {
 
 static GtkWidget*
-dring_crash_dialog()
+jamid_crash_dialog()
 {
     GtkWidget *dialog = gtk_dialog_new();
     gtk_window_set_destroy_with_parent(GTK_WINDOW(dialog), TRUE);
@@ -54,7 +54,7 @@ dring_crash_dialog()
     gtk_widget_set_margin_top(content_area, 25);
 
     auto message = gtk_label_new(
-        _("Trying to reconnect to the Jami daemon (dring)…")
+        _("Trying to reconnect to the Jami daemon (jamid)…")
     );
 
     gtk_box_pack_start(GTK_BOX(content_area), message, FALSE, TRUE, 0);
@@ -84,7 +84,7 @@ quitting_dialog()
         win,
         (GtkDialogFlags)(GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT),
         GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
-        _("Could not re-connect to the Jami daemon (dring).\nJami will now quit.")
+        _("Could not re-connect to the Jami daemon (jamid).\nJami will now quit.")
     );
 
     if (win) {
@@ -132,9 +132,9 @@ check_connection_cb(GtkWidget *warning_dialog)
 static gboolean
 error_cb(G_GNUC_UNUSED gpointer user_data)
 {
-    g_warning("dring has possibly crashed, or has been killed... will wait 2.5 seconds and try to reconnect");
+    g_warning("jamid has possibly crashed, or has been killed... will wait 2.5 seconds and try to reconnect");
 
-    auto warning_dialog = dring_crash_dialog();
+    auto warning_dialog = jamid_crash_dialog();
     gtk_window_present(GTK_WINDOW(warning_dialog));
 
     /* allow 2.5 seconds for the daemon to restart and then see if we're re-connected */