diff --git a/configs/mender_convert_config b/configs/mender_convert_config
index 620098e..94386f0 100644
--- a/configs/mender_convert_config
+++ b/configs/mender_convert_config
@@ -115,15 +115,15 @@ MENDER_PARTITION_ALIGNMENT="8388608"
 # Valid values are "latest" (default), "master" or a specific version
 MENDER_CLIENT_VERSION="latest"
 
-# Install Mender Shell addon
+# Install Mender Connect addon
 #
-MENDER_ADDON_SHELL_INSTALL="n"
+MENDER_ADDON_CONNECT_INSTALL="n"
 
-# Mender Shell addon version
+# Mender Connect addon version
 #
 # Valid values are "latest" (default), "master" or a specific version
-# MENDER_ADDON_SHELL_VERSION="latest"
-MENDER_ADDON_SHELL_VERSION="master"
+# MENDER_ADDON_CONNECT_VERSION="latest"
+MENDER_ADDON_CONNECT_VERSION="master"
 
 # File storage, containing binary files, do not modify this unless you know
 # what you are doing.
diff --git a/mender-convert-modify b/mender-convert-modify
index 534dbcf..2dd1e11 100755
--- a/mender-convert-modify
+++ b/mender-convert-modify
@@ -118,23 +118,23 @@ if [ "${MENDER_ENABLE_SYSTEMD}" == "y" ]; then
         work/rootfs/etc/systemd/system/multi-user.target.wants/mender-client.service"
 fi
 
-if [ "${MENDER_ADDON_SHELL_INSTALL}" = "y" ]; then
+if [ "${MENDER_ADDON_CONNECT_INSTALL}" = "y" ]; then
 
-  log_info "Installing Mender Shell addon"
+  log_info "Installing Mender Connect addon"
 
-  if [ "${MENDER_ADDON_SHELL_VERSION}" = "latest" ]; then
-    deb_name=$(deb_from_repo_dist_get "work/deb-packages" ${MENDER_APT_REPO_URL} ${deb_arch} "stable" "mender-shell")
-  elif [ "${MENDER_ADDON_SHELL_VERSION}" = "master" ]; then
-    deb_name=$(deb_from_repo_dist_get "work/deb-packages" ${MENDER_APT_REPO_URL} ${deb_arch} "experimental" "mender-shell")
+  if [ "${MENDER_ADDON_CONNECT_VERSION}" = "latest" ]; then
+    deb_name=$(deb_from_repo_dist_get "work/deb-packages" ${MENDER_APT_REPO_URL} ${deb_arch} "stable" "mender-connect")
+  elif [ "${MENDER_ADDON_CONNECT_VERSION}" = "master" ]; then
+    deb_name=$(deb_from_repo_dist_get "work/deb-packages" ${MENDER_APT_REPO_URL} ${deb_arch} "experimental" "mender-connect")
   else
     DEBIAN_REVISION="-1"
-    deb_name=$(deb_from_repo_pool_get "work/deb-packages" ${MENDER_APT_REPO_URL} ${deb_arch} "mender-shell" "${MENDER_ADDON_SHELL_VERSION}${DEBIAN_REVISION}")
+    deb_name=$(deb_from_repo_pool_get "work/deb-packages" ${MENDER_APT_REPO_URL} ${deb_arch} "mender-connect" "${MENDER_ADDON_CONNECT_VERSION}${DEBIAN_REVISION}")
   fi
 
   deb_extract_package "work/deb-packages/${deb_name}" "work/rootfs/"
 
-  run_and_log_cmd "sudo ln -sf /lib/systemd/system/mender-shell.service \
-        work/rootfs/etc/systemd/system/multi-user.target.wants/mender-shell.service"
+  run_and_log_cmd "sudo ln -sf /lib/systemd/system/mender-connect.service \
+        work/rootfs/etc/systemd/system/multi-user.target.wants/mender-connect.service"
 fi
 
 if [ "${MENDER_GRUB_EFI_INTEGRATION}" == "y" ]; then
diff --git a/scripts/bootstrap-rootfs-overlay-demo-server.sh b/scripts/bootstrap-rootfs-overlay-demo-server.sh
index a0f1645..af8b4c3 100755
--- a/scripts/bootstrap-rootfs-overlay-demo-server.sh
+++ b/scripts/bootstrap-rootfs-overlay-demo-server.sh
@@ -69,7 +69,7 @@ EOF
 
 chmod 600 ${output_dir}/etc/mender/mender.conf
 
-cat <<- EOF > ${output_dir}/etc/mender/mender-shell.conf
+cat <<- EOF > ${output_dir}/etc/mender/mender-connect.conf
 {
   "ServerURL": "https://docker.mender.io",
   "ShellCommand": "/bin/sh",
@@ -77,7 +77,7 @@ cat <<- EOF > ${output_dir}/etc/mender/mender-shell.conf
 }
 EOF
 
-chmod 600 ${output_dir}/etc/mender/mender-shell.conf
+chmod 600 ${output_dir}/etc/mender/mender-connect.conf
 
 cat <<- EOF > ${output_dir}/etc/hosts
 127.0.0.1	localhost