diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6cf528902b2d99eaf80cd7472b77295ff036b848..c0246bb058d596a3c0e7aa3581ada28cdd9e78cd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,7 @@ ENDIF()
 set (CMAKE_CXX_STANDARD 14)
 
 # set project name and version
-PROJECT(ring-client-gnome)
+PROJECT(jami-client-gnome)
 
 IF(EXISTS "${PROJECT_SOURCE_DIR}/version.txt")
    FILE (STRINGS "version.txt" PROJECT_VERSION)
@@ -355,12 +355,12 @@ IF (GETTEXT_FOUND)
 ENDIF(GETTEXT_FOUND)
 
 # install and compile glib gsettings schema
-add_schema("cx.ring.RingGnome.gschema.xml" GSCHEMA_RING)
+add_schema("net.jami.client.gnome.gschema.xml" GSCHEMA_RING)
 
-ADD_EXECUTABLE(gnome-ring ${GLIB_RESOURCES_RING} ${GSCHEMA_RING} ${SRC_FILES})
+ADD_EXECUTABLE(jami-gnome ${GLIB_RESOURCES_RING} ${GSCHEMA_RING} ${SRC_FILES})
 
 IF(NOT ${ENABLE_STATIC} MATCHES false)
-TARGET_LINK_LIBRARIES(gnome-ring
+TARGET_LINK_LIBRARIES(jami-gnome
    ${LIB_RING_CLIENT_LIBRARY}
    ${GTK3_LIBRARIES}
    ${Qt5Core_LIBRARIES}
@@ -377,7 +377,7 @@ TARGET_LINK_LIBRARIES(gnome-ring
    -lrt
    )
 ELSE()
-TARGET_LINK_LIBRARIES(gnome-ring
+TARGET_LINK_LIBRARIES(jami-gnome
    ${LIB_RING_CLIENT_LIBRARY}
    ${GTK3_LIBRARIES}
    ${Qt5Core_LIBRARIES}
@@ -420,46 +420,46 @@ CONFIGURE_FILE (
    "${PROJECT_BINARY_DIR}/config.h"
 )
 
-INSTALL(TARGETS gnome-ring
+INSTALL(TARGETS jami-gnome
    RUNTIME DESTINATION bin
 )
 
 # install .desktop in XDG desktop dir so that it is recognized by the system
-INSTALL(FILES ${PROJECT_SOURCE_DIR}/gnome-ring.desktop
+INSTALL(FILES ${PROJECT_SOURCE_DIR}/jami-gnome.desktop
     DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications
 )
 
 # install audio files
 INSTALL(FILES ${PROJECT_SOURCE_DIR}/sounds/ringtone_notify.wav
-    DESTINATION ${CMAKE_INSTALL_PREFIX}/share/sounds/gnome-ring
+    DESTINATION ${CMAKE_INSTALL_PREFIX}/share/sounds/jami-gnome
 )
 
-# install .desktop in the gnome-ring data dir, so that it can be copied to the
+# install .desktop in the jami-gnome data dir, so that it can be copied to the
 # autostart dir by the client
-INSTALL(FILES ${PROJECT_SOURCE_DIR}/gnome-ring.desktop.autostart
+INSTALL(FILES ${PROJECT_SOURCE_DIR}/jami-gnome.desktop.autostart
    DESTINATION
-      ${CMAKE_INSTALL_PREFIX}/share/gnome-ring/
+      ${CMAKE_INSTALL_PREFIX}/share/jami-gnome
    PERMISSIONS
       WORLD_READ
       OWNER_WRITE
       OWNER_READ
       GROUP_READ
    RENAME
-      gnome-ring.desktop
+      jami-gnome.desktop
 )
 
 INSTALL(FILES pixmaps/jami.svg
     DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps
 )
 
-INSTALL(FILES gnome-ring.appdata.xml
+INSTALL(FILES jami-gnome.appdata.xml
     DESTINATION ${CMAKE_INSTALL_PREFIX}/share/appdata/
 )
 
-# install shell script which will launch "ring"
+# install shell script which will launch Jami
 INSTALL(
    FILES
-      "${PROJECT_SOURCE_DIR}/src/ring.cx"
+      "${PROJECT_SOURCE_DIR}/src/jami"
    DESTINATION
       ${CMAKE_INSTALL_PREFIX}/bin
    PERMISSIONS
diff --git a/README.md b/README.md
index f5696a3e87a4b613550568da0423a353ccf80e13..cf3ad8789f6c3ada11b08cd7f216ca901b25e85a 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,7 @@ cmake ..
 make
 ```
 
-You can then simply run `./gnome-ring` from the build directory
+You can then simply run `./jami-gnome` from the build directory
 
 ## Installing
 
diff --git a/data/cx.ring.RingGnome.gschema.xml b/data/net.jami.client.gnome.gschema.xml
similarity index 98%
rename from data/cx.ring.RingGnome.gschema.xml
rename to data/net.jami.client.gnome.gschema.xml
index 68770ffd27f1575ca51b188b229ccfa46d5202eb..0dc9db635c73c53066d598e326e4e85898316745 100644
--- a/data/cx.ring.RingGnome.gschema.xml
+++ b/data/net.jami.client.gnome.gschema.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schemalist>
-  <schema path="/net/jami/JamiGnome/" id="cx.ring.RingGnome">
+  <schema path="/net/jami/JamiGnome/" id="net.jami.client.gnome">
     <key name="start-on-login" type="b">
         <default>true</default>
         <summary>Start Jami on login.</summary>
diff --git a/doc/gnome-ring.1 b/doc/jami-gnome.1
similarity index 68%
rename from doc/gnome-ring.1
rename to doc/jami-gnome.1
index 449739a0ce7452439f8829680cd7f5261ff509b5..e9504835869d5463a3387b8c9190daa2efacaf59 100644
--- a/doc/gnome-ring.1
+++ b/doc/jami-gnome.1
@@ -1,11 +1,11 @@
-.\" Manpage for gnome-ring.
-.TH man 8 "08 April 2016" "1.0" "gnome-ring man page"
+.\" Manpage for jami-gnome.
+.TH man 8 "08 April 2016" "1.0" "jami-gnome man page"
 .SH NAME
-gnome-ring \- Gnome client for Ring.cx
+jami-gnome \- Gnome client for jami.net
 .SH SYNOPSIS
-gnome-ring [options]
+jami-gnome [options]
 .SH DESCRIPTION
-gnome-ring is a gnome client for Ring.cx
+jami-gnome is a gnome client for jami.net
 .SH OPTIONS
 .B \-v, \-\-version
 Display the version and exit.
diff --git a/gnome-ring.appdata.xml b/jami-gnome.appdata.xml
similarity index 93%
rename from gnome-ring.appdata.xml
rename to jami-gnome.appdata.xml
index fa40abee65f81f6afb362767782dfe72c70cc37a..18334c1cee7580fe339a96e01a0f12f3c0524dba 100644
--- a/gnome-ring.appdata.xml
+++ b/jami-gnome.appdata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2017 Savoir-faire Linux -->
 <component type="desktop">
- <id>gnome-ring.desktop</id>
+ <id>jami-gnome.desktop</id>
  <metadata_license>CC-BY-SA-3.0</metadata_license>
  <project_license>GPL-3.0+</project_license>
  <name>Jami</name>
diff --git a/gnome-ring.desktop b/jami-gnome.desktop
similarity index 95%
rename from gnome-ring.desktop
rename to jami-gnome.desktop
index 2ca33419c3311b8a37f859289847809c9b4e1db9..fe625bda07ff9fec80c943aca90f4a3d9460d077 100644
--- a/gnome-ring.desktop
+++ b/jami-gnome.desktop
@@ -4,7 +4,7 @@ GenericName=Jami
 Comment[hu]=A Jami egy biztonságos és elosztott csevegőprogram
 Comment[ru]=Jami — приложение для защищённой связи с распределённой архитектурой
 Comment=Jami is a secured and distributed communication software
-Exec=gnome-ring %u
+Exec=jami-gnome %u
 Icon=jami
 StartupNotify=true
 Terminal=false
diff --git a/gnome-ring.desktop.autostart b/jami-gnome.desktop.autostart
similarity index 90%
rename from gnome-ring.desktop.autostart
rename to jami-gnome.desktop.autostart
index 8bb2152e49b66023dd8d2e1c64a4454c6c58398c..07f017ceeda735e4017e3c01e32973f498e7f5b9 100644
--- a/gnome-ring.desktop.autostart
+++ b/jami-gnome.desktop.autostart
@@ -4,7 +4,7 @@ GenericName=Jami
 Comment[hu]=A Jami egy biztonságos és elosztott csevegőprogram
 Comment[ru]=Jami — приложение для защищённой связи с распределённой архитектурой
 Comment=Jami is a secured and distributed communication software
-Exec=gnome-ring --restore-last-window-state
+Exec=jami-gnome --restore-last-window-state
 Icon=jami
 StartupNotify=true
 Terminal=false
diff --git a/src/config.h.in b/src/config.h.in
index ad8e8202d3416730a7e620297bbaf0a47283038c..feab57285eb13c29b0f9b5dc03e20b0d6cd7e887 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -8,11 +8,11 @@
 #define USE_LIBNM @USE_LIBNM@
 #define USE_CANBERRA @USE_CANBERRA@
 
-#define RING_CLIENT_APP_ID "cx.ring.RingGnome"
+#define RING_CLIENT_APP_ID "net.jami.client.gnome"
 
 #define RING_CLIENT_INSTALL "@RING_INSTALL_PREFIX@"
-#define RING_DATA_DIR "/share/gnome-ring"
+#define JAMI_DATA_DIR "/share/jami-gnome"
 
 #define PACKAGE_NAME "@PROJECT_NAME@"
 #define LOCALEDIR    "@RING_INSTALL_PREFIX@/share/locale"
-#define SOUNDSDIR    "@RING_INSTALL_PREFIX@/share/sounds/gnome-ring"
+#define SOUNDSDIR    "@RING_INSTALL_PREFIX@/share/sounds/jami-gnome"
diff --git a/src/ring.cx b/src/jami
similarity index 93%
rename from src/ring.cx
rename to src/jami
index 3bf25f02213bcb828f7d1227e5d3cd487805c2fa..1fbee5b2f8f252026ac24670d53c99c6b5c228bd 100644
--- a/src/ring.cx
+++ b/src/jami
@@ -26,11 +26,11 @@ if type "ring-kde" > /dev/null 2> /dev/null; then
   HAS_KDE=1
 fi
 
-if type "gnome-ring" > /dev/null 2> /dev/null; then
+if type "jami-gnome" > /dev/null 2> /dev/null; then
   HAS_GNOME=1
 fi
 
-# No clients installd
+# No clients installed
 if [ $HAS_KDE == "0" ] && [ $HAS_GNOME == "0" ]; then
   echo "Jami not found" >&2
   exit 1
@@ -41,14 +41,14 @@ if [ $HAS_KDE == "1" ] && [ $HAS_GNOME == "0" ]; then
   ring-kde $*
   exit $?
 elif [ $HAS_KDE == "0" ] && [ $HAS_GNOME == "1" ]; then
-  gnome-ring $*
+  jami-gnome $*
   exit $?
 fi
 
 # Both clients installed: run KDE client if KDE wm is running
 # else use the Gnome client.
 if [ -z "$(ps aux | grep kwin | grep -v grep)" ]; then
-  gnome-ring $*
+  jami-gnome $*
   exit $?
 else
   ring-kde $*
diff --git a/src/utils/files.cpp b/src/utils/files.cpp
index 79d0c319960e299359eb8ca25c19e53ca1a54c69..d37661b1f52b1674fb0876468bcffbeb130fefb2 100644
--- a/src/utils/files.cpp
+++ b/src/utils/files.cpp
@@ -29,13 +29,13 @@
 void
 autostart_symlink(gboolean autostart)
 {
-    /* autostart is enabled by creating a symlink to gnome-ring.desktop in
+    /* autostart is enabled by creating a symlink to jami-gnome.desktop in
      * $XDG_CONFIG_HOME/autostart (by default ~/.config/autostart)
      * and removing it to disable autostart
      */
 
     GError *error = NULL;
-    gchar *autostart_path = g_strconcat(g_get_user_config_dir(), "/autostart/gnome-ring.desktop", NULL);
+    gchar *autostart_path = g_strconcat(g_get_user_config_dir(), "/autostart/jami-gnome.desktop", NULL);
 
     if (autostart) {
         g_debug("enabling autostart");
@@ -53,9 +53,9 @@ autostart_symlink(gboolean autostart)
          */
         int num_paths = 3;
         gchar *desktop_paths[num_paths];
-        desktop_paths[0] = g_strconcat("/usr", RING_DATA_DIR, "/gnome-ring.desktop", NULL);
-        desktop_paths[1] = g_strconcat("/usr/local", RING_DATA_DIR, "/gnome-ring.desktop", NULL);
-        desktop_paths[2] = g_strconcat(RING_CLIENT_INSTALL, RING_DATA_DIR, "/gnome-ring.desktop", NULL);
+        desktop_paths[0] = g_strconcat("/usr", JAMI_DATA_DIR, "/jami-gnome.desktop", NULL);
+        desktop_paths[1] = g_strconcat("/usr/local", JAMI_DATA_DIR, "/jami-gnome.desktop", NULL);
+        desktop_paths[2] = g_strconcat(RING_CLIENT_INSTALL, JAMI_DATA_DIR, "/jami-gnome.desktop", NULL);
 
         for (int i = 0; i < num_paths && !desktop_path; ++i) {
             g_debug("checking %s", desktop_paths[i]);