diff --git a/src/freedombone-app-rss b/src/freedombone-app-rss
index 2275be3b..2ed7048f 100755
--- a/src/freedombone-app-rss
+++ b/src/freedombone-app-rss
@@ -83,7 +83,7 @@ function reconfigure_rss {
 function upgrade_rss {
     if grep -Fxq "install_rss" $COMPLETION_FILE; then
         function_check set_repo_commit
-        set_repo_commit $RSS_READER_PATH "RSS reader commit" "$RSS_READER_COMMIT" $RSS_READER_REPO
+        set_repo_commit $RSS_READER_PATH "rss reader commit" "$RSS_READER_COMMIT" $RSS_READER_REPO
         function_check rss_modifications
         rss_modifications
     fi
@@ -104,26 +104,26 @@ function upgrade_rss {
         if [ -d $RSS_READER_PATH/g2ttree-mobile ]; then
             if grep -Fxq "install_rss_mobile_reader" $COMPLETION_FILE; then
                 sed -i '/install_rss_mobile_reader/d' $COMPLETION_FILE
-                sed -i '/RSS mobile reader commit/d' $COMPLETION_FILE
+                sed -i '/rss mobile reader commit/d' $COMPLETION_FILE
                 rm -rf $RSS_READER_PATH/g2ttree-mobile
             fi
         fi
 
         # update to the next commit
         function_check set_repo_commit
-        set_repo_commit $RSS_MOBILE_READER_PATH "RSS mobile reader commit" "$RSS_MOBILE_READER_COMMIT" $RSS_MOBILE_READER_REPO
+        set_repo_commit $RSS_MOBILE_READER_PATH "rss mobile reader commit" "$RSS_MOBILE_READER_COMMIT" $RSS_MOBILE_READER_REPO
     fi
 }
 
 function backup_local_rss {
     RSS_READER_DOMAIN_NAME='ttrss'
-    if grep -q "RSS reader domain" $COMPLETION_FILE; then
-        RSS_READER_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "RSS reader domain" | awk -F ':' '{print $2}')
+    if grep -q "rss reader domain" $COMPLETION_FILE; then
+        RSS_READER_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "rss reader domain" | awk -F ':' '{print $2}')
     fi
 
-    if grep -q "RSS reader domain" $COMPLETION_FILE; then
+    if grep -q "rss reader domain" $COMPLETION_FILE; then
         if [ -d /etc/share/tt-rss ]; then
-            RSS_READER_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "RSS reader domain" | awk -F ':' '{print $2}')
+            RSS_READER_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "rss reader domain" | awk -F ':' '{print $2}')
 
             echo $"Backing up ttrss"
 
@@ -138,10 +138,10 @@ function backup_local_rss {
 }
 
 function restore_local_rss {
-    if ! grep -q "RSS reader domain" $COMPLETION_FILE; then
+    if ! grep -q "rss reader domain" $COMPLETION_FILE; then
         return
     fi
-    RSS_READER_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "RSS reader domain" | awk -F ':' '{print $2}')
+    RSS_READER_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "rss reader domain" | awk -F ':' '{print $2}')
     if [ $RSS_READER_DOMAIN_NAME ]; then
         echo $"Restoring ttrss"
         temp_restore_dir=/root/tempttrss
@@ -189,8 +189,8 @@ function restore_local_rss {
 }
 
 function backup_remote_rss {
-    if grep -q "RSS reader domain" $COMPLETION_FILE; then
-        RSS_READER_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "RSS reader domain" | awk -F ':' '{print $2}')
+    if grep -q "rss reader domain" $COMPLETION_FILE; then
+        RSS_READER_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "rss reader domain" | awk -F ':' '{print $2}')
         if [ -d /etc/share/tt-rss ]; then
             function_check suspend_site
             suspend_site ${RSS_READER_DOMAIN_NAME}
@@ -212,9 +212,9 @@ function backup_remote_rss {
 }
 
 function restore_remote_rss {
-    if grep -q "RSS reader domain" $COMPLETION_FILE; then
+    if grep -q "rss reader domain" $COMPLETION_FILE; then
         echo $"Restoring ttrss"
-        RSS_READER_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "RSS reader domain" | awk -F ':' '{print $2}')
+        RSS_READER_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "rss reader domain" | awk -F ':' '{print $2}')
         function_check restore_database_from_friend
 
         function_check rss_create_database
@@ -311,8 +311,8 @@ function install_rss_main {
     fi
     cd $RSS_READER_PATH
     git checkout $RSS_READER_COMMIT -b $RSS_READER_COMMIT
-    if ! grep -q "RSS reader commit" $COMPLETION_FILE; then
-        echo "RSS reader commit:$RSS_READER_COMMIT" >> $COMPLETION_FILE
+    if ! grep -q "rss reader commit" $COMPLETION_FILE; then
+        echo "rss reader commit:$RSS_READER_COMMIT" >> $COMPLETION_FILE
     fi
 
     function_check install_mariadb
@@ -580,7 +580,7 @@ function install_rss_mobile_reader {
     if [ -d $RSS_READER_PATH/g2ttree-mobile ]; then
         if grep -Fxq "install_rss_mobile_reader" $COMPLETION_FILE; then
             sed -i '/install_rss_mobile_reader/d' $COMPLETION_FILE
-            sed -i '/RSS mobile reader commit/d' $COMPLETION_FILE
+            sed -i '/rss mobile reader commit/d' $COMPLETION_FILE
             rm -rf $RSS_READER_PATH/g2ttree-mobile
         fi
     fi
@@ -598,8 +598,8 @@ function install_rss_mobile_reader {
     fi
     cd $RSS_MOBILE_READER_PATH
     git checkout $RSS_MOBILE_READER_COMMIT -b $RSS_MOBILE_READER_COMMIT
-    if ! grep -q "RSS mobile reader commit" $COMPLETION_FILE; then
-        echo "RSS mobile reader commit:$RSS_MOBILE_READER_COMMIT" >> $COMPLETION_FILE
+    if ! grep -q "rss mobile reader commit" $COMPLETION_FILE; then
+        echo "rss mobile reader commit:$RSS_MOBILE_READER_COMMIT" >> $COMPLETION_FILE
     fi
 
     echo 'define({' > $RSS_MOBILE_READER_PATH/scripts/conf.js
diff --git a/src/freedombone-app-webmail b/src/freedombone-app-webmail
index a7332e5a..d3448c1c 100755
--- a/src/freedombone-app-webmail
+++ b/src/freedombone-app-webmail
@@ -77,7 +77,7 @@ function reconfigure_webmail {
 
 function upgrade_webmail {
     function_check set_repo_commit
-    set_repo_commit $WEBMAIL_PATH "Webmail commit" "$WEBMAIL_COMMIT" $WEBMAIL_REPO
+    set_repo_commit $WEBMAIL_PATH "webmail commit" "$WEBMAIL_COMMIT" $WEBMAIL_REPO
 }
 
 function backup_local_webmail {
@@ -159,10 +159,10 @@ function install_webmail {
         git_clone $WEBMAIL_REPO webmail
         cd $WEBMAIL_PATH
         git checkout $WEBMAIL_COMMIT -b $WEBMAIL_COMMIT
-        if ! grep -q "Webmail commit" $COMPLETION_FILE; then
-            echo "Webmail commit:$WEBMAIL_COMMIT" >> $COMPLETION_FILE
+        if ! grep -q "webmail commit" $COMPLETION_FILE; then
+            echo "webmail commit:$WEBMAIL_COMMIT" >> $COMPLETION_FILE
         else
-            sed -i "s/Webmail commit.*/Webmail commit:$WEBMAIL_COMMIT/g" $COMPLETION_FILE
+            sed -i "s/webmail commit.*/webmail commit:$WEBMAIL_COMMIT/g" $COMPLETION_FILE
         fi
     fi
     if [ ! -f $WEBMAIL_PATH/index.php ]; then
diff --git a/src/freedombone-controlpanel b/src/freedombone-controlpanel
index 92009334..964063ac 100755
--- a/src/freedombone-controlpanel
+++ b/src/freedombone-controlpanel
@@ -369,7 +369,7 @@ function show_domains {
         fi
     done
 
-    if grep -q "RSS reader domain" $COMPLETION_FILE; then
+    if grep -q "rss reader domain" $COMPLETION_FILE; then
         if [ -d /var/lib/tor/hidden_service_ttrss ]; then
             echo -n -e "$(pad_string 'RSS reader')"
             RSSDOM='-'
diff --git a/src/freedombone-utils-upgrade b/src/freedombone-utils-upgrade
index c63d50a6..9f1a6166 100755
--- a/src/freedombone-utils-upgrade
+++ b/src/freedombone-utils-upgrade
@@ -76,6 +76,8 @@ function upgrade_installation_from_previous_versions {
     sed -i 's|Hubzilla|hubzilla|g' $COMPLETION_FILE
     sed -i 's|Gogs|gogs|g' $COMPLETION_FILE
     sed -i 's|Wiki|wiki|g' $COMPLETION_FILE
+    sed -i 's|RSS|rss|g' $COMPLETION_FILE
+    sed -i 's|Webmail|webmail|g' $COMPLETION_FILE
 
     if [ -f /usr/local/bin/zeronetavahi ]; then
         rm /usr/local/bin/zeronetavahi