From 9f050c70e09e3dc381312ef4c15390c97ce37e1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Kn=C3=B6ppler?=
 <6317548+theCalcaholic@users.noreply.github.com>
Date: Wed, 12 Apr 2023 17:56:14 +0200
Subject: [PATCH] Fix capitalization of Nextcloud(Pi)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Tobias Knöppler <6317548+theCalcaholic@users.noreply.github.com>
---
 .github/ISSUE_TEMPLATE/1_Bug_report.md        |  4 ++--
 .github/ISSUE_TEMPLATE/3_Support_question.md  |  8 ++++----
 .../ISSUE_TEMPLATE/4_Documentation_issue.md   |  4 ++--
 .github/ISSUE_TEMPLATE/5_Security_issue.md    |  2 +-
 .github/workflows/build-lxd.yml               |  6 +++---
 .github/workflows/build-sd-images.yml         |  6 +++---
 bin/ncp-backup                                |  4 ++--
 bin/ncp-check-updates                         |  8 ++++----
 bin/ncp-config                                |  8 ++++----
 bin/ncp-provisioning.sh                       |  4 ++--
 bin/ncp-report                                |  2 +-
 bin/ncp-suggestions                           |  4 ++--
 bin/ncp-update                                |  4 ++--
 bin/ncp/BACKUPS/nc-export-ncp.sh              |  4 ++--
 bin/ncp/BACKUPS/nc-import-ncp.sh              |  2 +-
 bin/ncp/BACKUPS/nc-restore-snapshot.sh        |  2 +-
 bin/ncp/BACKUPS/nc-rsync-auto.sh              |  2 +-
 bin/ncp/BACKUPS/nc-rsync.sh                   |  2 +-
 bin/ncp/BACKUPS/nc-snapshot-auto.sh           |  4 ++--
 bin/ncp/BACKUPS/nc-snapshot.sh                |  2 +-
 bin/ncp/CONFIG/nc-database.sh                 |  2 +-
 bin/ncp/CONFIG/nc-datadir.sh                  |  6 +++---
 bin/ncp/CONFIG/nc-httpsonly.sh                |  2 +-
 bin/ncp/CONFIG/nc-init.sh                     |  4 ++--
 bin/ncp/CONFIG/nc-limits.sh                   |  2 +-
 bin/ncp/CONFIG/nc-scan-auto.sh                |  2 +-
 bin/ncp/CONFIG/nc-trusted-domains.sh          |  2 +-
 bin/ncp/CONFIG/nc-webui.sh                    |  4 ++--
 bin/ncp/NETWORKING/duckDNS.sh                 |  6 +++---
 bin/ncp/NETWORKING/letsencrypt.sh             |  2 +-
 bin/ncp/NETWORKING/nc-forward-ports.sh        |  4 ++--
 bin/ncp/NETWORKING/nc-static-IP.sh            | 10 +++++-----
 bin/ncp/NETWORKING/nc-trusted-proxies.sh      |  2 +-
 bin/ncp/NETWORKING/no-ip.sh                   |  2 +-
 bin/ncp/NETWORKING/samba.sh                   |  8 ++++----
 bin/ncp/NETWORKING/spDYN.sh                   | 16 +++++++--------
 bin/ncp/SECURITY/fail2ban.sh                  |  4 ++--
 bin/ncp/SECURITY/modsecurity.sh               |  8 ++++----
 bin/ncp/SECURITY/nc-audit.sh                  |  4 ++--
 bin/ncp/SECURITY/nc-encrypt.sh                |  2 +-
 bin/ncp/SYSTEM/nc-automount.sh                |  2 +-
 bin/ncp/SYSTEM/nc-hdd-monitor.sh              |  2 +-
 bin/ncp/SYSTEM/nc-ramlogs.sh                  |  2 +-
 bin/ncp/SYSTEM/nc-swapfile.sh                 |  2 +-
 bin/ncp/SYSTEM/nc-zram.sh                     |  4 ++--
 bin/ncp/TOOLS/nc-scan.sh                      |  2 +-
 bin/ncp/UPDATES/nc-autoupdate-nc.sh           |  2 +-
 bin/ncp/UPDATES/nc-autoupdate-ncp.sh          | 10 +++++-----
 bin/ncp/UPDATES/nc-notify-updates.sh          |  6 +++---
 bin/ncp/UPDATES/nc-update.sh                  |  2 +-
 bin/ncp/UPDATES/unattended-upgrades.sh        |  2 +-
 build/armbian/armbian.sh                      |  4 ++--
 build/batch.sh                                |  2 +-
 build/build-LXC.sh                            |  4 ++--
 build/build-LXD.sh                            |  4 ++--
 build/build-SD-armbian.sh                     |  4 ++--
 build/build-SD-berryboot.sh                   |  2 +-
 build/build-SD-rpi.sh                         |  4 ++--
 build/build-VM.sh                             |  4 ++--
 build/build-docker.sh                         |  2 +-
 build/buildlib.sh                             |  2 +-
 build/docker/nextcloud/020nextcloud           |  2 +-
 changelog.md                                  |  2 +-
 etc/library.sh                                |  6 +++---
 etc/ncp-config.d/NFS.cfg                      |  2 +-
 etc/ncp-config.d/fail2ban.cfg                 |  2 +-
 etc/ncp-config.d/l10n/NFS/pt.json             |  2 +-
 etc/ncp-config.d/l10n/NFS/zh.json             |  2 +-
 etc/ncp-config.d/l10n/fail2ban/zh.json        |  2 +-
 etc/ncp-config.d/l10n/modsecurity/es.json     |  2 +-
 etc/ncp-config.d/l10n/modsecurity/pt.json     |  2 +-
 etc/ncp-config.d/l10n/modsecurity/zh.json     |  2 +-
 etc/ncp-config.d/l10n/nc-automount/zh.json    |  2 +-
 .../l10n/nc-autoupdate-ncp/zh.json            |  2 +-
 etc/ncp-config.d/l10n/nc-export-ncp/es.json   |  2 +-
 etc/ncp-config.d/l10n/nc-export-ncp/pt.json   |  2 +-
 etc/ncp-config.d/l10n/nc-export-ncp/zh.json   |  2 +-
 .../l10n/nc-forward-ports/es.json             |  2 +-
 .../l10n/nc-forward-ports/pt.json             |  2 +-
 .../l10n/nc-forward-ports/zh.json             |  2 +-
 etc/ncp-config.d/l10n/nc-import-ncp/es.json   |  2 +-
 etc/ncp-config.d/l10n/nc-import-ncp/pt.json   |  2 +-
 etc/ncp-config.d/l10n/nc-import-ncp/zh.json   |  2 +-
 etc/ncp-config.d/l10n/nc-info/es.json         |  2 +-
 etc/ncp-config.d/l10n/nc-info/pt.json         |  2 +-
 etc/ncp-config.d/l10n/nc-info/zh.json         |  2 +-
 etc/ncp-config.d/l10n/nc-init/zh.json         |  2 +-
 etc/ncp-config.d/l10n/nc-limits/es.json       |  2 +-
 etc/ncp-config.d/l10n/nc-limits/pt.json       |  2 +-
 etc/ncp-config.d/l10n/nc-limits/zh.json       |  2 +-
 etc/ncp-config.d/l10n/nc-nextcloud/pt.json    |  6 +++---
 etc/ncp-config.d/l10n/nc-nextcloud/zh.json    |  6 +++---
 .../l10n/nc-notify-updates/pt.json            |  2 +-
 .../l10n/nc-notify-updates/zh.json            |  2 +-
 etc/ncp-config.d/l10n/nc-passwd/es.json       |  2 +-
 etc/ncp-config.d/l10n/nc-passwd/pt.json       |  2 +-
 etc/ncp-config.d/l10n/nc-passwd/zh.json       |  2 +-
 etc/ncp-config.d/l10n/nc-restore/es.json      |  4 ++--
 etc/ncp-config.d/l10n/nc-restore/pt.json      |  4 ++--
 etc/ncp-config.d/l10n/nc-restore/zh.json      |  2 +-
 etc/ncp-config.d/l10n/nc-rsync-auto/pt.json   |  2 +-
 etc/ncp-config.d/l10n/nc-scan-auto/zh.json    |  4 ++--
 etc/ncp-config.d/l10n/nc-scan/zh.json         |  4 ++--
 etc/ncp-config.d/l10n/nc-update/pt.json       |  2 +-
 etc/ncp-config.d/l10n/nc-update/zh.json       |  2 +-
 etc/ncp-config.d/modsecurity.cfg              |  2 +-
 etc/ncp-config.d/nc-autoupdate-ncp.cfg        |  2 +-
 etc/ncp-config.d/nc-export-ncp.cfg            |  2 +-
 etc/ncp-config.d/nc-forward-ports.cfg         |  2 +-
 etc/ncp-config.d/nc-import-ncp.cfg            |  2 +-
 etc/ncp-config.d/nc-info.cfg                  |  2 +-
 etc/ncp-config.d/nc-init.cfg                  |  4 ++--
 etc/ncp-config.d/nc-limits.cfg                |  2 +-
 etc/ncp-config.d/nc-nextcloud.cfg             |  2 +-
 etc/ncp-config.d/nc-notify-updates.cfg        |  2 +-
 etc/ncp-config.d/nc-passwd.cfg                |  2 +-
 etc/ncp-config.d/nc-restore-snapshot.cfg      |  2 +-
 etc/ncp-config.d/nc-restore.cfg               |  4 ++--
 etc/ncp-config.d/nc-update.cfg                |  2 +-
 etc/ncp-config.d/samba.cfg                    |  2 +-
 etc/ncp-templates/ncp-metrics.cfg.sh          |  2 +-
 i18n/README-zh_CN.md                          | 20 +++++++++----------
 i18n/README-zh_TW.md                          | 20 +++++++++----------
 install.sh                                    |  4 ++--
 ncp-activation/CSS.css                        |  4 ++--
 ncp-activation/JS.js                          |  6 +++---
 ncp-activation/index.php                      | 16 +++++++--------
 ncp-app/appinfo/info.xml                      |  8 ++++----
 ncp-app/appinfo/routes.php                    |  2 +-
 ncp-app/lib/Controller/PageController.php     |  2 +-
 ncp-app/templates/index.php                   |  2 +-
 ncp-web/activate/CSS.css                      |  4 ++--
 ncp-web/activate/JS.js                        |  6 +++---
 ncp-web/activate/index.php                    | 16 +++++++--------
 ncp-web/backups.php                           |  2 +-
 ncp-web/csrf.php                              |  2 +-
 ncp-web/css/ncp.css                           |  4 ++--
 ncp-web/decrypt/CSS.css                       |  4 ++--
 ncp-web/decrypt/JS.js                         |  2 +-
 ncp-web/decrypt/index.php                     |  6 +++---
 ncp-web/download.php                          |  2 +-
 ncp-web/download_logs.php                     |  2 +-
 ncp-web/elements.php                          |  2 +-
 ncp-web/index.php                             | 14 ++++++-------
 ncp-web/js/ncp.js                             |  2 +-
 ncp-web/l10n/de.json                          |  2 +-
 ncp-web/l10n/es.json                          |  2 +-
 ncp-web/ncp-launcher.php                      |  2 +-
 ncp-web/upload.php                            |  2 +-
 run_update_history.sh                         |  4 ++--
 tests/activation_tests.py                     |  6 +++---
 tests/nextcloud_tests.py                      |  4 ++--
 tests/system_tests.py                         |  4 ++--
 update.sh                                     |  2 +-
 154 files changed, 283 insertions(+), 283 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/1_Bug_report.md b/.github/ISSUE_TEMPLATE/1_Bug_report.md
index d31d1c46..44ceab9c 100644
--- a/.github/ISSUE_TEMPLATE/1_Bug_report.md
+++ b/.github/ISSUE_TEMPLATE/1_Bug_report.md
@@ -5,7 +5,7 @@ about: Report errors and problems
 ---
 
 <!--
-Thanks for reporting issues back to NextCloudPi! 
+Thanks for reporting issues back to NextcloudPi! 
 
 Here you can file bugs and feature requests. **Do NOT ask questions**, this is not a support forum.
 
@@ -13,7 +13,7 @@ If there is an important security issue that has gone unnoticed, please send a p
 
 ### DO NOT ASK QUESTIONS, USE THE FORUMS
 
-NCP and its extras are explained in the wiki, also make sure to read the articles in ownyourbits explaining NextCloudPi extras before asking. https://ownyourbits.com/category/nextcloudpi/
+NCP and its extras are explained in the wiki, also make sure to read the articles in ownyourbits explaining NextcloudPi extras before asking. https://ownyourbits.com/category/nextcloudpi/
 
 For asking questions, please use the forums. https://help.nextcloud.com/c/support/appliances-docker-snappy-vm
 
diff --git a/.github/ISSUE_TEMPLATE/3_Support_question.md b/.github/ISSUE_TEMPLATE/3_Support_question.md
index dcea3136..b11eb4bb 100644
--- a/.github/ISSUE_TEMPLATE/3_Support_question.md
+++ b/.github/ISSUE_TEMPLATE/3_Support_question.md
@@ -4,7 +4,7 @@ about: Do NOT ask here - Use the forum
 
 ---
 
-Thanks for reporting issues back to NextCloudPi! 
+Thanks for reporting issues back to NextcloudPi! 
 
 Here you can file bugs and feature requests. **Do NOT ask questions**, this is not a support forum.
 
@@ -12,11 +12,11 @@ Here you can file bugs and feature requests. **Do NOT ask questions**, this is n
 DO NOT ASK QUESTIONS, USE THE FORUMS
 ---
 
-NCP and its extras are explained in the wiki, also make sure to read the articles in ownyourbits explaining NextCloudPi extras before asking. https://ownyourbits.com/category/nextcloudpi/
+NCP and its extras are explained in the wiki, also make sure to read the articles in ownyourbits explaining NextcloudPi extras before asking. https://ownyourbits.com/category/nextcloudpi/
 
-We use GitHub issues only to discuss about NextCloudPi bugs and new features.
+We use GitHub issues only to discuss about NextcloudPi bugs and new features.
 
-NCP and its extras are explained in the [wiki](https://github.com/nextcloud/nextcloudpi/wiki), also make sure to read the [articles in ownyourbits](https://ownyourbits.com/category/nextcloudpi/) explaining NextCloudPi extras before asking.
+NCP and its extras are explained in the [wiki](https://github.com/nextcloud/nextcloudpi/wiki), also make sure to read the [articles in ownyourbits](https://ownyourbits.com/category/nextcloudpi/) explaining NextcloudPi extras before asking.
 
 For any other question or comment, please use the [forums](https://help.nextcloud.com/c/support/appliances-docker-snappy-vm), and make sure to tag
 the thread as `ncp`.
diff --git a/.github/ISSUE_TEMPLATE/4_Documentation_issue.md b/.github/ISSUE_TEMPLATE/4_Documentation_issue.md
index aaf761f6..117a8be2 100644
--- a/.github/ISSUE_TEMPLATE/4_Documentation_issue.md
+++ b/.github/ISSUE_TEMPLATE/4_Documentation_issue.md
@@ -1,10 +1,10 @@
 ---
 name: ⛔ Documentation Issue
-about: See the NextCloudPi Wiki
+about: See the NextcloudPi Wiki
 
 ---
 
-The NextCloudPi wiki is open to anyone to edit. If you find something inaccurate,
+The NextcloudPi wiki is open to anyone to edit. If you find something inaccurate,
 missing or that can be improved, please feel free to contribute to it.
 
 https://github.com/nextcloud/nextcloudpi/wiki
diff --git a/.github/ISSUE_TEMPLATE/5_Security_issue.md b/.github/ISSUE_TEMPLATE/5_Security_issue.md
index dd3e0a6b..c13db7e6 100644
--- a/.github/ISSUE_TEMPLATE/5_Security_issue.md
+++ b/.github/ISSUE_TEMPLATE/5_Security_issue.md
@@ -6,7 +6,7 @@ about: Email nacho [at] ownyourbits.com
 
 ⚠ PLEASE DON'T DISCLOSE SECURITY-RELATED ISSUES PUBLICLY, SEE BELOW.
 
-If you have found a security issue in NextCloudPi, please send the details to
+If you have found a security issue in NextcloudPi, please send the details to
 nacho [at] ownyourbits.com and don't disclose it publicly until we can provide a
 fix for it.
 
diff --git a/.github/workflows/build-lxd.yml b/.github/workflows/build-lxd.yml
index 2fa01393..7f232ba4 100644
--- a/.github/workflows/build-lxd.yml
+++ b/.github/workflows/build-lxd.yml
@@ -71,7 +71,7 @@ jobs:
         id: pack-lxd
         run: |
           . ./build/buildlib.sh
-          ARTIFACT_FILE="NextCloudPi_LXD_${LXD_ARCH:-x86}_${VERSION//\//_}"
+          ARTIFACT_FILE="NextcloudPi_LXD_${LXD_ARCH:-x86}_${VERSION//\//_}"
           lxc image export -q ncp/"${version}" "output/${ARTIFACT_FILE}"
           echo "artifact_file=${ARTIFACT_FILE}.tar.gz" >> $GITHUB_OUTPUT
       - name: upload LXD image to artifact store
@@ -158,7 +158,7 @@ jobs:
         id: pack-lxd
         run: |
           . ./build/buildlib.sh
-          ARTIFACT_FILE="NextCloudPi_LXD_${LXD_ARCH:-x86}_${VERSION//\//_}"
+          ARTIFACT_FILE="NextcloudPi_LXD_${LXD_ARCH:-x86}_${VERSION//\//_}"
           lxc image export -q ncp/"${version}" "output/${ARTIFACT_FILE}"
           echo "artifact_file=${ARTIFACT_FILE}.tar.gz" >> $GITHUB_OUTPUT
       - name: upload LXD image to artifact store
@@ -246,7 +246,7 @@ jobs:
         run: |
           set -x
           . ./build/buildlib.sh
-          ARTIFACT_FILE="NextCloudPi_LXD_${LXD_ARCH:-x86}_${VERSION//\//_}"
+          ARTIFACT_FILE="NextcloudPi_LXD_${LXD_ARCH:-x86}_${VERSION//\//_}"
           lxc publish -q ncp -f --alias "ncp/updated"
           mkdir -p output
           lxc image export -q "ncp/updated" "output/${ARTIFACT_FILE}"
diff --git a/.github/workflows/build-sd-images.yml b/.github/workflows/build-sd-images.yml
index 6a6c35f7..dd81962d 100644
--- a/.github/workflows/build-sd-images.yml
+++ b/.github/workflows/build-sd-images.yml
@@ -65,7 +65,7 @@ jobs:
         run: |
           set -ex
           export LIB_TAG=master
-          export IMG="NextCloudPi_${{ inputs.board_name }}_${VERSION//\//_}.img"
+          export IMG="NextcloudPi_${{ inputs.board_name }}_${VERSION//\//_}.img"
           [[ "${{ github.ref_protected }}" == true ]] || export DBG=x
           
           ./build/build-SD-armbian.sh "${{ inputs.board_id }}" "${{ inputs.board_name }}"
@@ -84,7 +84,7 @@ jobs:
           sudo rm -rf armbian/ tmp/ output/
           
           export LIB_TAG=master
-          export IMG="NextCloudPi_${{ inputs.board_name }}_${VERSION//\//_}.img"
+          export IMG="NextcloudPi_${{ inputs.board_name }}_${VERSION//\//_}.img"
           [[ "${{ github.ref_protected }}" == true ]] || export DBG=x
 
           ./build/build-SD-armbian.sh "${{ inputs.board_id }}" "${{ inputs.board_name }}"
@@ -106,7 +106,7 @@ jobs:
         run: |
           set -ex
           echo -e "${LOG_CICD} Protected? ${{ github.ref_protected }}"
-          export IMG="NextCloudPi_${{ inputs.board_name }}_${VERSION//\//_}.img"
+          export IMG="NextcloudPi_${{ inputs.board_name }}_${VERSION//\//_}.img"
           [[ "${{ github.ref_protected }}" == true ]] || export DBG=x
           wget -q https://github.com/multiarch/qemu-user-static/releases/latest/download/qemu-aarch64-static -O ./qemu-aarch64-static
           ./build/build-SD-rpi.sh
diff --git a/bin/ncp-backup b/bin/ncp-backup
index f7e22a43..4b4e1441 100755
--- a/bin/ncp-backup
+++ b/bin/ncp-backup
@@ -21,7 +21,7 @@ dbbackup=nextcloud-sqlbkp_$( date +"%Y%m%d" ).bak
 [[ "$compress" == "yes" ]] && destfile="$destfile".gz
 
 datadir=$( get_nc_config_value datadirectory ) || {
-  echo "Error reading data directory. Is NextCloud running and configured?";
+  echo "Error reading data directory. Is Nextcloud running and configured?";
   exit 1;
 }
 
@@ -101,4 +101,4 @@ rm "$dbbackup"
 chmod 640 "$destfile"
 chown :www-data "$destfile"
 
-echo "backup $destfile generated"
\ No newline at end of file
+echo "backup $destfile generated"
diff --git a/bin/ncp-check-updates b/bin/ncp-check-updates
index 3a70b357..b5eed303 100755
--- a/bin/ncp-check-updates
+++ b/bin/ncp-check-updates
@@ -2,12 +2,12 @@
 
 # print message if an update is available
 
-VERFILE=/usr/local/etc/ncp-version 
+VERFILE=/usr/local/etc/ncp-version
 LATEST=/var/run/.ncp-latest-version
 
 if ncp-test-updates; then
-  echo -e "\nNextCloudPi \e[1m$( cat $VERFILE)\e[0m is outdated"
-  echo -e "update to \e[1m$( cat $LATEST )\e[0m through 'ncp-config' or type 'sudo ncp-update'" 
+  echo -e "\nNextcloudPi \e[1m$( cat $VERFILE)\e[0m is outdated"
+  echo -e "update to \e[1m$( cat $LATEST )\e[0m through 'ncp-config' or type 'sudo ncp-update'"
 else
-  echo -e "\nNextCloudPi \e[1m$( cat $VERFILE)\e[0m is up to date"
+  echo -e "\nNextcloudPi \e[1m$( cat $VERFILE)\e[0m is up to date"
 fi
diff --git a/bin/ncp-config b/bin/ncp-config
index fea145ae..e1885034 100755
--- a/bin/ncp-config
+++ b/bin/ncp-config
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# NextCloudPi software configuration
+# NextcloudPi software configuration
 #
 # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 # GPL licensed (see end of file) * Use at your own risk!
@@ -23,7 +23,7 @@ source /usr/local/etc/library.sh
 
     latest_ver="$(cat /var/run/.ncp-latest-version 2>/dev/null)"
     whiptail --backtitle "$backtitle $ncpversion" \
-             --title "NextCloudPi update available" \
+             --title "NextcloudPi update available" \
              --clear --yesno "Update to $latest_ver?\n\n$changelog" \
              15 70
 
@@ -59,7 +59,7 @@ function generate_list()
 function config_menu()
 {
   local dir="$1"
-  local backtitle="NextCloudPi configuration ver. "
+  local backtitle="NextcloudPi configuration ver. "
   local ncpversion="$(cat /usr/local/etc/ncp-version  )"
   local cfgdir=/usr/local/etc/ncp-config.d
   local dialog_ok=0
@@ -73,7 +73,7 @@ function config_menu()
     # launch the selection menu
     [[ "$dir" == "$BINDIR" ]] && local cancel_btn="Finish" || local cancel_btn="Back"
     ncp_app=$( whiptail --backtitle "$backtitle $ncpversion" \
-                       --title "NextCloudPi Configuration Tool (ncp-config)" \
+                       --title "NextcloudPi Configuration Tool (ncp-config)" \
                        --cancel-button $cancel_btn --ok-button Select \
                        --menu "Select ncp-app to configure or activate:" 20 105 10 \
                        "${list[@]}" \
diff --git a/bin/ncp-provisioning.sh b/bin/ncp-provisioning.sh
index 68b12df1..d8419e6e 100644
--- a/bin/ncp-provisioning.sh
+++ b/bin/ncp-provisioning.sh
@@ -21,7 +21,7 @@ REDISPASS="$( grep "^requirepass" /etc/redis/redis.conf | cut -f2 -d' ' )"
 
 ### If there exists already a configuration adjust the password
 [[ -f "$CFG" ]] && {
-  echo "Updating NextCloud config with Redis password"
+  echo "Updating Nextcloud config with Redis password"
   sed -i "s|'password'.*|'password' => '$REDISPASS',|" "$CFG"
 }
 
@@ -46,7 +46,7 @@ EOF
 }
 
 [[ -f "$CFG" ]] && {
-  echo "Updating NextCloud config with MariaDB password"
+  echo "Updating Nextcloud config with MariaDB password"
   sed -i "s|'dbpassword' =>.*|'dbpassword' => '$DBPASSWD',|" "$CFG"
 }
 
diff --git a/bin/ncp-report b/bin/ncp-report
index c2738903..1893cf4e 100755
--- a/bin/ncp-report
+++ b/bin/ncp-report
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# NextCloudPi diagnostics report
+# NextcloudPi diagnostics report
 #
 # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 # GPL licensed (see end of file) * Use at your own risk!
diff --git a/bin/ncp-suggestions b/bin/ncp-suggestions
index bc314867..51a4b0fb 100644
--- a/bin/ncp-suggestions
+++ b/bin/ncp-suggestions
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# NextCloudPi configuration suggestions
+# NextcloudPi configuration suggestions
 #
 # Copyleft 2018 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 # GPL licensed (see end of file) * Use at your own risk!
@@ -15,7 +15,7 @@
 OUT="$@"
 
 source /usr/local/etc/library.sh
-  
+
 check_distro || \
   echo -e "You are using an outdated distro release. You should upgrade to latest Debian/Raspbian"
 
diff --git a/bin/ncp-update b/bin/ncp-update
index 25753417..bed37bf4 100755
--- a/bin/ncp-update
+++ b/bin/ncp-update
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# update latest NextCloudPi code from github
+# update latest NextcloudPi code from github
 
 [[ -z "$DBG" ]] || set -$DBG
 
@@ -61,7 +61,7 @@ fi
     sed '/HEAD ->\|origin/s|\[.*\(tag: v[0-9]\+\.[0-9]\+\.[0-9]\+\).*\]|[\1]|' | \
     sed 's|* \[tag: |[|' > /usr/local/etc/ncp-changelog
 
-  echo -e "NextCloudPi updated to version $VER"
+  echo -e "NextcloudPi updated to version $VER"
   exit 0
 
 } # force to read the whole thing into memory, as its contents might change in update.sh
diff --git a/bin/ncp/BACKUPS/nc-export-ncp.sh b/bin/ncp/BACKUPS/nc-export-ncp.sh
index 9e0660b4..579c62a2 100644
--- a/bin/ncp/BACKUPS/nc-export-ncp.sh
+++ b/bin/ncp/BACKUPS/nc-export-ncp.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Export NextCloudPi configuration
+# Export NextcloudPi configuration
 #
 #
 # Copyleft 2017 by Courtney Hicks
@@ -9,7 +9,7 @@
 
 
 
-configure() 
+configure()
 {
   [[ -d "$DIR" ]] || { echo "directory $DIR does not exist"; return 1; }
 
diff --git a/bin/ncp/BACKUPS/nc-import-ncp.sh b/bin/ncp/BACKUPS/nc-import-ncp.sh
index 1368829e..b55af93f 100644
--- a/bin/ncp/BACKUPS/nc-import-ncp.sh
+++ b/bin/ncp/BACKUPS/nc-import-ncp.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Import NextCloudPi configuration
+# Import NextcloudPi configuration
 #
 #
 # Copyleft 2017 by Courtney Hicks
diff --git a/bin/ncp/BACKUPS/nc-restore-snapshot.sh b/bin/ncp/BACKUPS/nc-restore-snapshot.sh
index eef88b85..b90bd31c 100644
--- a/bin/ncp/BACKUPS/nc-restore-snapshot.sh
+++ b/bin/ncp/BACKUPS/nc-restore-snapshot.sh
@@ -17,7 +17,7 @@ configure()
 
   local datadir mountpoint
   datadir=$( get_nc_config_value datadirectory ) || {
-    echo -e "Error reading data directory. Is NextCloud running?";
+    echo -e "Error reading data directory. Is Nextcloud running?";
     return 1;
   }
 
diff --git a/bin/ncp/BACKUPS/nc-rsync-auto.sh b/bin/ncp/BACKUPS/nc-rsync-auto.sh
index c9d5ae5f..a7fab27e 100644
--- a/bin/ncp/BACKUPS/nc-rsync-auto.sh
+++ b/bin/ncp/BACKUPS/nc-rsync-auto.sh
@@ -24,7 +24,7 @@ configure()
 
   local DATADIR
   DATADIR=$( get_nc_config_value datadirectory ) || {
-    echo -e "Error reading data directory. Is NextCloud running and configured?";
+    echo -e "Error reading data directory. Is Nextcloud running and configured?";
     return 1;
   }
 
diff --git a/bin/ncp/BACKUPS/nc-rsync.sh b/bin/ncp/BACKUPS/nc-rsync.sh
index 91bc5399..5ba0bbc7 100644
--- a/bin/ncp/BACKUPS/nc-rsync.sh
+++ b/bin/ncp/BACKUPS/nc-rsync.sh
@@ -20,7 +20,7 @@ configure()
 
   local DATADIR
   DATADIR=$( get_nc_config_value datadirectory ) || {
-    echo -e "Error reading data directory. Is NextCloud running and configured?";
+    echo -e "Error reading data directory. Is Nextcloud running and configured?";
     return 1;
   }
 
diff --git a/bin/ncp/BACKUPS/nc-snapshot-auto.sh b/bin/ncp/BACKUPS/nc-snapshot-auto.sh
index e1a4fa97..8b0c4895 100644
--- a/bin/ncp/BACKUPS/nc-snapshot-auto.sh
+++ b/bin/ncp/BACKUPS/nc-snapshot-auto.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# NextCloudPi scheduled datadir BTRFS snapshots
+# NextcloudPi scheduled datadir BTRFS snapshots
 #
 # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 # GPL licensed (see end of file) * Use at your own risk!
@@ -30,7 +30,7 @@ configure()
 source /usr/local/etc/library.sh
 
 DATADIR="\$(get_nc_config_value datadirectory)" || {
-  echo -e "Error reading data directory. Is NextCloud running and configured?";
+  echo -e "Error reading data directory. Is Nextcloud running and configured?";
   exit 1;
 }
 
diff --git a/bin/ncp/BACKUPS/nc-snapshot.sh b/bin/ncp/BACKUPS/nc-snapshot.sh
index 5de7d50d..9287586e 100644
--- a/bin/ncp/BACKUPS/nc-snapshot.sh
+++ b/bin/ncp/BACKUPS/nc-snapshot.sh
@@ -21,7 +21,7 @@ configure()
 
   local DATADIR MOUNTPOINT
   DATADIR=$( get_nc_config_value datadirectory ) || {
-    echo -e "Error reading data directory. Is NextCloud running?";
+    echo -e "Error reading data directory. Is Nextcloud running?";
     return 1;
   }
 
diff --git a/bin/ncp/CONFIG/nc-database.sh b/bin/ncp/CONFIG/nc-database.sh
index 013cdf44..2522f78c 100644
--- a/bin/ncp/CONFIG/nc-database.sh
+++ b/bin/ncp/CONFIG/nc-database.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Data dir configuration script for NextCloudPi
+# Data dir configuration script for NextcloudPi
 #
 # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 # GPL licensed (see end of file) * Use at your own risk!
diff --git a/bin/ncp/CONFIG/nc-datadir.sh b/bin/ncp/CONFIG/nc-datadir.sh
index aa4c99e5..adda446a 100644
--- a/bin/ncp/CONFIG/nc-datadir.sh
+++ b/bin/ncp/CONFIG/nc-datadir.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Data dir configuration script for NextCloudPi
+# Data dir configuration script for NextcloudPi
 #
 # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 # GPL licensed (see end of file) * Use at your own risk!
@@ -59,7 +59,7 @@ configure()
   ## CHECKS
   local SRCDIR BASEDIR ENCDIR
   SRCDIR=$( get_nc_config_value datadirectory ) || {
-    echo -e "Error reading data directory. Is NextCloud running and configured?";
+    echo -e "Error reading data directory. Is Nextcloud running and configured?";
     return 1;
   }
   [ -d "${SRCDIR?}" ] || { echo -e "data directory $SRCDIR not found"; return 1; }
@@ -126,7 +126,7 @@ configure()
   # datadir
   ncc config:system:set datadirectory  --value="${DATADIR}" \
   || sed -i "s|'datadirectory' =>.*|'datadirectory' => '${DATADIR}',|" "${NCDIR?}"/config/config.php
-  
+
   ncc config:system:set logfile --value="${DATADIR}/nextcloud.log" \
   || sed -i "s|'logfile' =>.*|'logfile' => '${DATADIR}/nextcloud.log',|" "${NCDIR?}"/config/config.php
   set_ncpcfg datadir "${DATADIR}"
diff --git a/bin/ncp/CONFIG/nc-httpsonly.sh b/bin/ncp/CONFIG/nc-httpsonly.sh
index e51b1b7c..ce8fb5a3 100644
--- a/bin/ncp/CONFIG/nc-httpsonly.sh
+++ b/bin/ncp/CONFIG/nc-httpsonly.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# HTTPS rewrite configuration script for NextCloudPi
+# HTTPS rewrite configuration script for NextcloudPi
 #
 # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 # GPL licensed (see end of file) * Use at your own risk!
diff --git a/bin/ncp/CONFIG/nc-init.sh b/bin/ncp/CONFIG/nc-init.sh
index d07be266..0c684e2a 100644
--- a/bin/ncp/CONFIG/nc-init.sh
+++ b/bin/ncp/CONFIG/nc-init.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Init NextCloud database and perform initial configuration
+# Init Nextcloud database and perform initial configuration
 #
 # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 # GPL licensed (see end of file) * Use at your own risk!
@@ -127,7 +127,7 @@ EOF
   }
 
   mysql nextcloud <<EOF
-replace into  oc_appconfig values ( 'theming', 'name'          , "NextCloudPi"             );
+replace into  oc_appconfig values ( 'theming', 'name'          , "NextcloudPi"             );
 replace into  oc_appconfig values ( 'theming', 'slogan'        , "keep your data close"    );
 replace into  oc_appconfig values ( 'theming', 'url'           , "https://ownyourbits.com" );
 replace into  oc_appconfig values ( 'theming', 'logoMime'      , "image/svg+xml"           );
diff --git a/bin/ncp/CONFIG/nc-limits.sh b/bin/ncp/CONFIG/nc-limits.sh
index 3ce229b4..8a03bb0e 100644
--- a/bin/ncp/CONFIG/nc-limits.sh
+++ b/bin/ncp/CONFIG/nc-limits.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# System limits configuration for NextCloudPi
+# System limits configuration for NextcloudPi
 #
 # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 # GPL licensed (see end of file) * Use at your own risk!
diff --git a/bin/ncp/CONFIG/nc-scan-auto.sh b/bin/ncp/CONFIG/nc-scan-auto.sh
index 9350c49a..97138759 100644
--- a/bin/ncp/CONFIG/nc-scan-auto.sh
+++ b/bin/ncp/CONFIG/nc-scan-auto.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Periodically synchronize NextCloud for externally modified files
+# Periodically synchronize Nextcloud for externally modified files
 #
 # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 # GPL licensed (see end of file) * Use at your own risk!
diff --git a/bin/ncp/CONFIG/nc-trusted-domains.sh b/bin/ncp/CONFIG/nc-trusted-domains.sh
index 39144e90..beadecf1 100644
--- a/bin/ncp/CONFIG/nc-trusted-domains.sh
+++ b/bin/ncp/CONFIG/nc-trusted-domains.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Manually add trusted domains in NextCloudPi
+# Manually add trusted domains in NextcloudPi
 #
 # Copyleft 2019 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 # GPL licensed (see end of file) * Use at your own risk!
diff --git a/bin/ncp/CONFIG/nc-webui.sh b/bin/ncp/CONFIG/nc-webui.sh
index 7b5ff637..cea848f0 100644
--- a/bin/ncp/CONFIG/nc-webui.sh
+++ b/bin/ncp/CONFIG/nc-webui.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Periodically synchronize NextCloud for externally modified files
+# Periodically synchronize Nextcloud for externally modified files
 #
 # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 # GPL licensed (see end of file) * Use at your own risk!
@@ -14,7 +14,7 @@ is_active()
   a2query -s ncp &>/dev/null
 }
 
-configure() 
+configure()
 {
   if [[ $ACTIVE != "yes" ]]; then
     a2dissite ncp
diff --git a/bin/ncp/NETWORKING/duckDNS.sh b/bin/ncp/NETWORKING/duckDNS.sh
index 4a16b7dd..e7aaf776 100644
--- a/bin/ncp/NETWORKING/duckDNS.sh
+++ b/bin/ncp/NETWORKING/duckDNS.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# DuckDNS installation on Raspbian for NextCloudPi
+# DuckDNS installation on Raspbian for NextcloudPi
 #
 #
 # Copyleft 2017 by Courtney Hicks
@@ -12,7 +12,7 @@ INSTALLDIR=duckdns
 INSTALLPATH=/usr/local/etc/$INSTALLDIR
 CRONFILE=/etc/cron.d/duckdns
 
-configure() 
+configure()
 {
   local DOMAIN="$( sed 's|.duckdns.org||' <<<"$DOMAIN" )"
   if [[ $ACTIVE == "yes" ]]; then
@@ -23,7 +23,7 @@ configure()
     touch "$INSTALLPATH"/duck.log
     echo -e "echo url=\"https://www.duckdns.org/update?domains=$DOMAIN&token=$TOKEN&ip=\" | curl -k -o "$INSTALLPATH"/duck.log -K -" > "$INSTALLPATH"/duck.sh
 
-    # Adds file to cron to run script for DNS record updates and change permissions 
+    # Adds file to cron to run script for DNS record updates and change permissions
     touch $CRONFILE
     echo "*/5 * * * * root $INSTALLPATH/duck.sh >/dev/null 2>&1" > "$CRONFILE"
     chmod 700 "$INSTALLPATH"/duck.sh
diff --git a/bin/ncp/NETWORKING/letsencrypt.sh b/bin/ncp/NETWORKING/letsencrypt.sh
index 0dfc9394..cdb8653a 100644
--- a/bin/ncp/NETWORKING/letsencrypt.sh
+++ b/bin/ncp/NETWORKING/letsencrypt.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Let's encrypt certbot installation on NextCloudPi
+# Let's encrypt certbot installation on NextcloudPi
 #
 # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 # GPL licensed (see end of file) * Use at your own risk!
diff --git a/bin/ncp/NETWORKING/nc-forward-ports.sh b/bin/ncp/NETWORKING/nc-forward-ports.sh
index aab6c9d4..d7c8f14c 100644
--- a/bin/ncp/NETWORKING/nc-forward-ports.sh
+++ b/bin/ncp/NETWORKING/nc-forward-ports.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Use uPnP to forward router ports for NextCloudPi
+# Use uPnP to forward router ports for NextcloudPi
 #
 # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 # GPL licensed (see end of file) * Use at your own risk!
@@ -15,7 +15,7 @@ install()
   DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends miniupnpc
 }
 
-configure() 
+configure()
 {
   local ip
   ip="$(get_ip)"
diff --git a/bin/ncp/NETWORKING/nc-static-IP.sh b/bin/ncp/NETWORKING/nc-static-IP.sh
index 63ce705f..064e7a7e 100644
--- a/bin/ncp/NETWORKING/nc-static-IP.sh
+++ b/bin/ncp/NETWORKING/nc-static-IP.sh
@@ -8,7 +8,7 @@
 # More at: https://ownyourbits.com
 #
 
-configure() 
+configure()
 {
   local GW="$( ip r | grep "default via"   | awk '{ print $3 }' | head -1 )"
   local DNS="$( grep nameserver /etc/resolv.conf | head -1 | awk '{ print $2 }' )"
@@ -19,8 +19,8 @@ configure()
   ## DHCPCD
   [[ -f /etc/dhcpcd.conf ]] && {
     # delete NCP config
-    grep -q "^# NextCloudPi autogenerated" /etc/dhcpcd.conf && \
-      sed -i '/^# NextCloudPi autogenerated/,+6d' /etc/dhcpcd.conf
+    grep -q "^# NextcloudPi autogenerated" /etc/dhcpcd.conf && \
+      sed -i '/^# NextcloudPi autogenerated/,+6d' /etc/dhcpcd.conf
 
     [[ $ACTIVE != "yes" ]] && {
       systemctl restart dhcpcd
@@ -29,7 +29,7 @@ configure()
     }
 
     cat >> /etc/dhcpcd.conf <<EOF
-# NextCloudPi autogenerated
+# NextcloudPi autogenerated
 # don't modify! better use ncp-config
 interface $IFACE
 static ip_address=$IP/24
@@ -86,7 +86,7 @@ EOF
     ifdown "${IFACE}"
     ifup "${IFACE}"
   }
- 
+
   ncc config:system:set trusted_domains 1 --value="$IP"
   set-nc-domain "${IP}"
   echo "Static IP set to $IP"
diff --git a/bin/ncp/NETWORKING/nc-trusted-proxies.sh b/bin/ncp/NETWORKING/nc-trusted-proxies.sh
index 34965335..4df41b57 100644
--- a/bin/ncp/NETWORKING/nc-trusted-proxies.sh
+++ b/bin/ncp/NETWORKING/nc-trusted-proxies.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Manually add trusted proxies in NextCloudPi
+# Manually add trusted proxies in NextcloudPi
 #
 # Copyleft 2019 by Pascal Haefliger <45995338+paschaef_a_t_users_d_o_t_noreply_d_o_tgithub_d_o_t_com>
 # GPL licensed (see end of file) * Use at your own risk!
diff --git a/bin/ncp/NETWORKING/no-ip.sh b/bin/ncp/NETWORKING/no-ip.sh
index a9ccdb5c..1924c69b 100644
--- a/bin/ncp/NETWORKING/no-ip.sh
+++ b/bin/ncp/NETWORKING/no-ip.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# no-ip.org installation on NextCloudPi
+# no-ip.org installation on NextcloudPi
 #
 # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 # GPL licensed (see end of file) * Use at your own risk!
diff --git a/bin/ncp/NETWORKING/samba.sh b/bin/ncp/NETWORKING/samba.sh
index ca58cb9d..f5e176b6 100644
--- a/bin/ncp/NETWORKING/samba.sh
+++ b/bin/ncp/NETWORKING/samba.sh
@@ -27,7 +27,7 @@ install()
 
   cat >> /etc/samba/smb.conf <<EOF
 
-# NextCloudPi automatically generated from here. Do not remove this comment
+# NextcloudPi automatically generated from here. Do not remove this comment
 EOF
 }
 
@@ -45,7 +45,7 @@ configure()
   ################################
   local DATADIR
   DATADIR=$( get_nc_config_value datadirectory ) || {
-    echo -e "Error reading data directory. Is NextCloud running and configured?";
+    echo -e "Error reading data directory. Is Nextcloud running and configured?";
     return 1;
   }
   [ -d "$DATADIR" ] || { echo -e "data directory $DATADIR not found"   ; return 1; }
@@ -54,11 +54,11 @@ configure()
   ################################
 
   # remove files from this line to the end
-  sed -i '/# NextCloudPi automatically/,/\$/d' /etc/samba/smb.conf
+  sed -i '/# NextcloudPi automatically/,/\$/d' /etc/samba/smb.conf
 
   # restore this line
   cat >> /etc/samba/smb.conf <<EOF
-# NextCloudPi automatically generated from here. Do not remove this comment
+# NextcloudPi automatically generated from here. Do not remove this comment
 EOF
 
   # create a share per Nextcloud user
diff --git a/bin/ncp/NETWORKING/spDYN.sh b/bin/ncp/NETWORKING/spDYN.sh
index a9a274c2..3288414a 100644
--- a/bin/ncp/NETWORKING/spDYN.sh
+++ b/bin/ncp/NETWORKING/spDYN.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# spDYN setup for NextCloudPi
+# spDYN setup for NextcloudPi
 #
 #
 # Copyleft 2017/2018 by Timm Goldenstein and Timo Stiefel
@@ -19,7 +19,7 @@ install()
   # Create the spdnsUpdater.sh
   mkdir -p "$INSTALLPATH"
   # Write the script to file
-  cat > "$INSTALLPATH"/spdnsUpdater.sh <<'EOF' 
+  cat > "$INSTALLPATH"/spdnsUpdater.sh <<'EOF'
 #!/bin/bash
 
 ### Usage
@@ -39,14 +39,14 @@ update_url="https://update.spdyn.de/nic/update"
 
 
 ### Update procedure
-function spdnsUpdater { 
+function spdnsUpdater {
 	# Send the current IP address to spdyn.de
 	# and show the response
-	
+
 	params=$1
 	updater=$(wget -qO- --post-data $params $update_url)
 	updater=$(echo $updater | grep -o '^[a-z]*')
-	
+
 	case "$updater" in
 		abuse) echo "[$updater] Der Host kann nicht aktualisiert werden, da er aufgrund vorheriger fehlerhafter Updateversuche gesperrt ist."
 			;;
@@ -89,10 +89,10 @@ EOF
 
 }
 
-configure() 
+configure()
 {
   if [[ $ACTIVE == "yes" ]]; then
-    
+
     # Adds file to cron to run script for DNS record updates and change permissions
     touch $CRONFILE
     echo "10 * * * * root $INSTALLPATH/spdnsUpdater.sh $DOMAIN $TOKEN >/dev/null 2>&1" > "$CRONFILE"
@@ -100,7 +100,7 @@ configure()
 
     # First-time execution of update script and print response from spdns.de server
     "$INSTALLPATH"/spdnsUpdater.sh "$DOMAIN" "$TOKEN"
-		
+
 		echo -e "\nspdnsUpdater is now enabled"
 
     # Removes config files and cron job if ACTIVE_ is set to no
diff --git a/bin/ncp/SECURITY/fail2ban.sh b/bin/ncp/SECURITY/fail2ban.sh
index a2daade2..6f0afda2 100644
--- a/bin/ncp/SECURITY/fail2ban.sh
+++ b/bin/ncp/SECURITY/fail2ban.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Fail2ban for NextCloudPi
+# Fail2ban for NextcloudPi
 #
 # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 # GPL licensed (see end of file) * Use at your own risk!
@@ -30,7 +30,7 @@ install()
 
   # tweak fail2ban email
   local F=/etc/fail2ban/action.d/sendmail-common.conf
-  sed -i 's|Fail2Ban|NextCloudPi|' /etc/fail2ban/action.d/sendmail-whois-lines.conf
+  sed -i 's|Fail2Ban|NextcloudPi|' /etc/fail2ban/action.d/sendmail-whois-lines.conf
   grep -q actionstart_ "$F" || sed -i 's|actionstart|actionstart_|' "$F"
   grep -q actionstop_  "$F" || sed -i 's|actionstop|actionstop_|'   "$F"
 
diff --git a/bin/ncp/SECURITY/modsecurity.sh b/bin/ncp/SECURITY/modsecurity.sh
index 44f5b251..629e189c 100644
--- a/bin/ncp/SECURITY/modsecurity.sh
+++ b/bin/ncp/SECURITY/modsecurity.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# modsecurity WAF installation on Raspbian 
+# modsecurity WAF installation on Raspbian
 #
 # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 # GPL licensed (see end of file) * Use at your own risk!
@@ -16,7 +16,7 @@ install()
 
   cat >> /etc/modsecurity/crs/crs-setup.conf <<'EOF'
 
-  # NextCloudPi: allow PROPFIND for webDAV
+  # NextcloudPi: allow PROPFIND for webDAV
   SecAction "id:900200, phase:1, nolog, pass, t:none, setvar:'tx.allowed_methods=GET HEAD POST OPTIONS PROPFIND'"
 EOF
 
@@ -37,8 +37,8 @@ EOF
 EOF
 }
 
-configure() 
-{ 
+configure()
+{
   local NCDIR=/var/www/nextcloud/
   local NCPWB=/var/www/ncp-web/
 
diff --git a/bin/ncp/SECURITY/nc-audit.sh b/bin/ncp/SECURITY/nc-audit.sh
index 0668ecdb..df0cc90d 100644
--- a/bin/ncp/SECURITY/nc-audit.sh
+++ b/bin/ncp/SECURITY/nc-audit.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Launch security audit reports for NextCloudPi
+# Launch security audit reports for NextcloudPi
 #
 # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 # GPL licensed (see end of file) * Use at your own risk!
@@ -22,7 +22,7 @@ skip-test=CUST-0810
 # Won't install puppet or similar
 skip-test=TOOL-5002
 
-# Raspbian doesn't have security sources ( https://www.raspberrypi.org/forums/viewtopic.php?t=98006&p=680175 ) 
+# Raspbian doesn't have security sources ( https://www.raspberrypi.org/forums/viewtopic.php?t=98006&p=680175 )
 skip-test=PKGS-7388
 
 # We have a preset partition scheme in the SD card
diff --git a/bin/ncp/SECURITY/nc-encrypt.sh b/bin/ncp/SECURITY/nc-encrypt.sh
index 862a5ee0..99a4ec34 100644
--- a/bin/ncp/SECURITY/nc-encrypt.sh
+++ b/bin/ncp/SECURITY/nc-encrypt.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Data at rest encryption for NextCloudPi
+# Data at rest encryption for NextcloudPi
 #
 # Copyleft 2021 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 # GPL licensed (see end of file) * Use at your own risk!
diff --git a/bin/ncp/SYSTEM/nc-automount.sh b/bin/ncp/SYSTEM/nc-automount.sh
index ca631527..dc3e24ce 100644
--- a/bin/ncp/SYSTEM/nc-automount.sh
+++ b/bin/ncp/SYSTEM/nc-automount.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Automount configuration for NextCloudPi
+# Automount configuration for NextcloudPi
 #
 # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 # GPL licensed (see end of file) * Use at your own risk!
diff --git a/bin/ncp/SYSTEM/nc-hdd-monitor.sh b/bin/ncp/SYSTEM/nc-hdd-monitor.sh
index 4b99da7e..d89a6806 100644
--- a/bin/ncp/SYSTEM/nc-hdd-monitor.sh
+++ b/bin/ncp/SYSTEM/nc-hdd-monitor.sh
@@ -47,7 +47,7 @@ EOF
 source /usr/local/etc/library.sh
 wall "\$SMARTD_MESSAGE"
 notify_admin \
-  "NextCloudPi HDD health \$SMARTD_FAILTYPE" \
+  "NextcloudPi HDD health \$SMARTD_FAILTYPE" \
   "\$SMARTD_MESSAGE"
 EOF
 chmod +x /usr/local/etc/ncp-hdd-notif.sh
diff --git a/bin/ncp/SYSTEM/nc-ramlogs.sh b/bin/ncp/SYSTEM/nc-ramlogs.sh
index 5cf8d41f..e239de18 100644
--- a/bin/ncp/SYSTEM/nc-ramlogs.sh
+++ b/bin/ncp/SYSTEM/nc-ramlogs.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Data dir configuration script for NextCloudPi
+# Data dir configuration script for NextcloudPi
 #
 # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 # GPL licensed (see end of file) * Use at your own risk!
diff --git a/bin/ncp/SYSTEM/nc-swapfile.sh b/bin/ncp/SYSTEM/nc-swapfile.sh
index 008f4eb9..e87f4132 100644
--- a/bin/ncp/SYSTEM/nc-swapfile.sh
+++ b/bin/ncp/SYSTEM/nc-swapfile.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Data dir configuration script for NextCloudPi
+# Data dir configuration script for NextcloudPi
 #
 # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 # GPL licensed (see end of file) * Use at your own risk!
diff --git a/bin/ncp/SYSTEM/nc-zram.sh b/bin/ncp/SYSTEM/nc-zram.sh
index c8b47660..90cd17e7 100644
--- a/bin/ncp/SYSTEM/nc-zram.sh
+++ b/bin/ncp/SYSTEM/nc-zram.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# NextCloudPi ZRAM settings
+# NextcloudPi ZRAM settings
 #
 # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 # GPL licensed (see end of file) * Use at your own risk!
@@ -63,7 +63,7 @@ chmod +x /usr/local/bin/ncp-zram
 
 configure()
 {
-  [[ $ACTIVE != "yes" ]] && { 
+  [[ $ACTIVE != "yes" ]] && {
     systemctl stop    zram
     systemctl disable zram
     echo "ZRAM disabled"
diff --git a/bin/ncp/TOOLS/nc-scan.sh b/bin/ncp/TOOLS/nc-scan.sh
index 89355d84..3c1a5a11 100644
--- a/bin/ncp/TOOLS/nc-scan.sh
+++ b/bin/ncp/TOOLS/nc-scan.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Synchronize NextCloud for externally modified files
+# Synchronize Nextcloud for externally modified files
 #
 # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 # GPL licensed (see end of file) * Use at your own risk!
diff --git a/bin/ncp/UPDATES/nc-autoupdate-nc.sh b/bin/ncp/UPDATES/nc-autoupdate-nc.sh
index 613e7803..02d8972c 100644
--- a/bin/ncp/UPDATES/nc-autoupdate-nc.sh
+++ b/bin/ncp/UPDATES/nc-autoupdate-nc.sh
@@ -29,7 +29,7 @@ if [[ \${PIPESTATUS[0]} -eq 0 ]]; then
 
   VER="\$( /usr/local/bin/ncc status | grep "version:" | awk '{ print \$3 }' )"
 
-  notify_admin "NextCloudPi" "Nextcloud was updated to \$VER"
+  notify_admin "NextcloudPi" "Nextcloud was updated to \$VER"
 fi
 echo "" >> /var/log/ncp.log
 EOF
diff --git a/bin/ncp/UPDATES/nc-autoupdate-ncp.sh b/bin/ncp/UPDATES/nc-autoupdate-ncp.sh
index fd205d4c..5f721d2e 100644
--- a/bin/ncp/UPDATES/nc-autoupdate-ncp.sh
+++ b/bin/ncp/UPDATES/nc-autoupdate-ncp.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Automatically apply NextCloudPi updates
+# Automatically apply NextcloudPi updates
 #
 # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 # GPL licensed (see end of file) * Use at your own risk!
@@ -11,9 +11,9 @@
 
 configure()
 {
-  [[ $ACTIVE != "yes" ]] && { 
+  [[ $ACTIVE != "yes" ]] && {
     rm -f /etc/cron.daily/ncp-autoupdate
-    echo "automatic NextCloudPi updates disabled"
+    echo "automatic NextcloudPi updates disabled"
     return 0
   }
 
@@ -25,11 +25,11 @@ exec >> /var/log/ncp.log 2>&1
 echo "\$(date) - Running \$0..."
 if /usr/local/bin/ncp-test-updates; then
   /usr/local/bin/ncp-update || exit 1
-  notify_admin "NextCloudPi" "NextCloudPi was updated to \$(cat /usr/local/etc/ncp-version)"
+  notify_admin "NextcloudPi" "NextcloudPi was updated to \$(cat /usr/local/etc/ncp-version)"
 fi
 EOF
   chmod 755 /etc/cron.daily/ncp-autoupdate
-  echo "automatic NextCloudPi updates enabled"
+  echo "automatic NextcloudPi updates enabled"
 }
 
 install() { :; }
diff --git a/bin/ncp/UPDATES/nc-notify-updates.sh b/bin/ncp/UPDATES/nc-notify-updates.sh
index 95670238..6502b29a 100644
--- a/bin/ncp/UPDATES/nc-notify-updates.sh
+++ b/bin/ncp/UPDATES/nc-notify-updates.sh
@@ -33,7 +33,7 @@ NOTIFIED=/var/run/.ncp-version-notified
 /usr/local/bin/ncp-check-nc-version
 
 test -e $LATEST || exit 0;
-/usr/local/bin/ncp-test-updates || { echo "NextCloudPi up to date"; exit 0; }
+/usr/local/bin/ncp-test-updates || { echo "NextcloudPi up to date"; exit 0; }
 
 test -e $NOTIFIED && [[ "$( cat $LATEST )" == "$( cat $NOTIFIED )" ]] && {
   echo "Found update from $( cat $VERFILE ) to $( cat $LATEST ). Already notified"
@@ -43,7 +43,7 @@ test -e $NOTIFIED && [[ "$( cat $LATEST )" == "$( cat $NOTIFIED )" ]] && {
 echo "Found update from $( cat $VERFILE ) to $( cat $LATEST ). Sending notification..."
 
 notify_admin \
-  "NextCloudPi update" \
+  "NextcloudPi update" \
   "Update from $( cat $VERFILE ) to $( cat $LATEST ) is available. Update from https://$(get_ip):4443"
 
 cat $LATEST > $NOTIFIED
@@ -75,7 +75,7 @@ echo -e "Packages automatically upgraded: $PKGS\n"
 
 # notify
 notify_admin \
-  "NextCloudPi Unattended Upgrades" \
+  "NextcloudPi Unattended Upgrades" \
   "Packages automatically upgraded $PKGS"
 EOF
   chmod +x /usr/local/bin/ncp-notify-unattended-upgrade
diff --git a/bin/ncp/UPDATES/nc-update.sh b/bin/ncp/UPDATES/nc-update.sh
index 7394c833..48fc0ac7 100644
--- a/bin/ncp/UPDATES/nc-update.sh
+++ b/bin/ncp/UPDATES/nc-update.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Data dir configuration script for NextCloudPi
+# Data dir configuration script for NextcloudPi
 #
 # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 # GPL licensed (see end of file) * Use at your own risk!
diff --git a/bin/ncp/UPDATES/unattended-upgrades.sh b/bin/ncp/UPDATES/unattended-upgrades.sh
index d708c0d3..63f37d25 100644
--- a/bin/ncp/UPDATES/unattended-upgrades.sh
+++ b/bin/ncp/UPDATES/unattended-upgrades.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Unattended upgrades installation on NextCloudPi
+# Unattended upgrades installation on NextcloudPi
 #
 # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 # GPL licensed (see end of file) * Use at your own risk!
diff --git a/build/armbian/armbian.sh b/build/armbian/armbian.sh
index 924f6f94..d546b456 100644
--- a/build/armbian/armbian.sh
+++ b/build/armbian/armbian.sh
@@ -2,7 +2,7 @@
 
 # arguments: $RELEASE $LINUXFAMILY $BOARD $BUILD_DESKTOP
 
-# This is the image customization script for NextCloudPi on Armbian
+# This is the image customization script for NextcloudPi on Armbian
 #
 # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 # GPL licensed (see end of file) * Use at your own risk!
@@ -25,7 +25,7 @@ source etc/library.sh # sets RELEASE
 chage -d -1 root
 
 # install NCP
-echo -e "\nInstalling NextCloudPi"
+echo -e "\nInstalling NextcloudPi"
 
 hostname -F /etc/hostname # fix 'sudo resolve host' errors
 
diff --git a/build/batch.sh b/build/batch.sh
index bb093b27..72b69e58 100755
--- a/build/batch.sh
+++ b/build/batch.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Batch creation of NextCloudPi images and containers
+# Batch creation of NextcloudPi images and containers
 #
 # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 # GPL licensed (see end of file) * Use at your own risk!
diff --git a/build/build-LXC.sh b/build/build-LXC.sh
index 76996ff3..50769e6e 100755
--- a/build/build-LXC.sh
+++ b/build/build-LXC.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Batch creation of NextCloudPi LXC image
+# Batch creation of NextcloudPi LXC image
 #
 # Copyleft 2021 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 # GPL licensed (see end of file) * Use at your own risk!
@@ -14,7 +14,7 @@ source build/buildlib.sh
 echo -e "\e[1m\n[ Build NCP LXC ]\e[0m"
 
 #CLEAN=0                    # Pass this envvar to skip cleaning download cache
-IMG="NextCloudPi_LXC_$( date  "+%m-%d-%y" ).img"
+IMG="NextcloudPi_LXC_$( date  "+%m-%d-%y" ).img"
 IMG=tmp/"$IMG"
 
 TAR=output/"$( basename "$IMG" .img ).tar.bz2"
diff --git a/build/build-LXD.sh b/build/build-LXD.sh
index 2487e7f0..674dc6ef 100755
--- a/build/build-LXD.sh
+++ b/build/build-LXD.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Batch creation of NextCloudPi LXD image
+# Batch creation of NextcloudPi LXD image
 #
 # Copyleft 2021 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 # GPL licensed (see end of file) * Use at your own risk!
@@ -14,7 +14,7 @@ source build/buildlib.sh
 echo -e "\e[1m\n[ Build NCP LXD ]\e[0m"
 
 #CLEAN=0                    # Pass this envvar to skip cleaning download cache
-IMG="NextCloudPi_LXD_$( date  "+%m-%d-%y" ).img"
+IMG="NextcloudPi_LXD_$( date  "+%m-%d-%y" ).img"
 IMG=tmp/"$IMG"
 
 TAR=output/"$( basename "$IMG" .img ).tar.bz2"
diff --git a/build/build-SD-armbian.sh b/build/build-SD-armbian.sh
index 34360633..cac629cf 100755
--- a/build/build-SD-armbian.sh
+++ b/build/build-SD-armbian.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Batch creation of NextCloudPi Armbian based images
+# Batch creation of NextcloudPi Armbian based images
 #
 # Copyleft 2018 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 # GPL licensed (see end of file) * Use at your own risk!
@@ -18,7 +18,7 @@ NCPCFG=etc/ncp.cfg
 
 echo -e "\e[1m\n[ Build NCP ${BNAME} ]\e[0m"
 
-IMG="${IMG:-NextCloudPi_${BNAME}_$( date  "+%m-%d-%y" ).img}"
+IMG="${IMG:-NextcloudPi_${BNAME}_$( date  "+%m-%d-%y" ).img}"
 IMG=tmp/"$IMG"
 TAR=output/"$( basename "$IMG" .img ).tar.bz2"
 
diff --git a/build/build-SD-berryboot.sh b/build/build-SD-berryboot.sh
index 84ebf9eb..c8d24b31 100755
--- a/build/build-SD-berryboot.sh
+++ b/build/build-SD-berryboot.sh
@@ -14,7 +14,7 @@ source build/buildlib.sh
 echo -e "\e[1m\n[ Build NCP Berryboot ]\e[0m"
 
 SRC="$1"
-IMG="NextCloudPi_RPi_Berryboot_$( date  "+%m-%d-%y" ).img"
+IMG="NextcloudPi_RPi_Berryboot_$( date  "+%m-%d-%y" ).img"
 TAR=output/"$( basename "$IMG" .img ).tar.bz2"
 
 test -f "$TAR" && { echo "$TAR already exists. Skipping... "; exit 0; }
diff --git a/build/build-SD-rpi.sh b/build/build-SD-rpi.sh
index d35e44d9..cc3b26cd 100755
--- a/build/build-SD-rpi.sh
+++ b/build/build-SD-rpi.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Batch creation of NextCloudPi image
+# Batch creation of NextcloudPi image
 #
 # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 # GPL licensed (see end of file) * Use at your own risk!
@@ -16,7 +16,7 @@ echo -e "\e[1m\n[ Build NCP Raspberry Pi ]\e[0m"
 URL="https://downloads.raspberrypi.org/raspios_lite_arm64/images/raspios_lite_arm64-2022-09-26/2022-09-22-raspios-bullseye-arm64-lite.img.xz"
 SIZE=4G                     # Raspbian image size
 #CLEAN=0                    # Pass this envvar to skip cleaning download cache
-IMG="${IMG:-NextCloudPi_RPi_$( date  "+%m-%d-%y" ).img}"
+IMG="${IMG:-NextcloudPi_RPi_$( date  "+%m-%d-%y" ).img}"
 TAR=output/"$( basename "$IMG" .img ).tar.bz2"
 
 ##############################################################################
diff --git a/build/build-VM.sh b/build/build-VM.sh
index 87e4e654..36869136 100755
--- a/build/build-VM.sh
+++ b/build/build-VM.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Batch creation of NextCloudPi VM image
+# Batch creation of NextcloudPi VM image
 #
 # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 # GPL licensed (see end of file) * Use at your own risk!
@@ -16,7 +16,7 @@ echo -e "\e[1m\n[ Build NCP VM ]\e[0m"
 IP=${1:-192.168.0.145}      # For QEMU automated testing (optional)
 SIZE=3G                     # Raspbian image size
 #CLEAN=0                    # Pass this envvar to skip cleaning download cache
-IMG="${IMG:-NextCloudPi_VM_$( date  "+%m-%d-%y" ).img}"
+IMG="${IMG:-NextcloudPi_VM_$( date  "+%m-%d-%y" ).img}"
 IMG=tmp/"$IMG"
 VM="/var/lib/libvirt/images/ncp-vm.img"
 
diff --git a/build/build-docker.sh b/build/build-docker.sh
index b6a9dede..79354855 100755
--- a/build/build-docker.sh
+++ b/build/build-docker.sh
@@ -1,4 +1,4 @@
-# Batch-build docker container layers for NextCloudPi
+# Batch-build docker container layers for NextcloudPi
 #
 # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 # GPL licensed (see end of file) * Use at your own risk!
diff --git a/build/buildlib.sh b/build/buildlib.sh
index 5870ab8f..7da3fb44 100644
--- a/build/buildlib.sh
+++ b/build/buildlib.sh
@@ -322,7 +322,7 @@ function create_torrent()
   [[ -d "$DIR" ]] && { echo "dir $DIR already exists"; return 1; }
   mkdir -p torrent/"$IMGNAME" && cp -v --reflink=auto "$TAR" torrent/"$IMGNAME"
   md5sum "$DIR"/*.bz2 > "$DIR"/md5sum
-  createtorrent -a udp://tracker.opentrackr.org -p 1337 -c "NextCloudPi. Nextcloud ready to use image" "$DIR" "$DIR".torrent
+  createtorrent -a udp://tracker.opentrackr.org -p 1337 -c "NextcloudPi. Nextcloud ready to use image" "$DIR" "$DIR".torrent
   transmission-remote -w $(pwd)/torrent -a "$DIR".torrent
 }
 
diff --git a/build/docker/nextcloud/020nextcloud b/build/docker/nextcloud/020nextcloud
index 3a4400a4..579e0dec 100755
--- a/build/docker/nextcloud/020nextcloud
+++ b/build/docker/nextcloud/020nextcloud
@@ -76,7 +76,7 @@ bash /usr/local/bin/nextcloud-domain.sh
   ncc notify_push:self-test > /dev/null 2>&1 || ncc notify_push:setup "https://$2/push"
 }
 
-echo "Nextcloud version $(nc_version). NextCloudPi version $(cat /usr/local/etc/ncp-version)"
+echo "Nextcloud version $(nc_version). NextcloudPi version $(cat /usr/local/etc/ncp-version)"
 
 # Display NC logs in the docker logs
 LOG_FILE="$(get_nc_config_value logfile 2> /dev/null || true)"
diff --git a/changelog.md b/changelog.md
index 7403d22c..c2aed2e4 100644
--- a/changelog.md
+++ b/changelog.md
@@ -990,7 +990,7 @@
 
 ## [v0.53.30](https://github.com/nextcloud/nextcloudpi/commit/9c600bd) (2018-04-20) ncp-report: fix root execution
 
-## [v0.53.29](https://github.com/nextcloud/nextcloudpi/commit/a9458f5) (2018-04-05) renamed to NextCloudPlus
+## [v0.53.29](https://github.com/nextcloud/nextcloudpi/commit/a9458f5) (2018-04-05) renamed to NextcloudPlus
 
 ## [v0.53.28](https://github.com/nextcloud/nextcloudpi/commit/0d6c780) (2018-04-18) ncp-web: added spanish translations
 
diff --git a/etc/library.sh b/etc/library.sh
index e0676ccc..47735626 100644
--- a/etc/library.sh
+++ b/etc/library.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# NextCloudPi function library
+# NextcloudPi function library
 #
 # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 # GPL licensed (see end of file) * Use at your own risk!
@@ -62,7 +62,7 @@ function configure_app()
 {
   local ncp_app="$1"
   local cfg_file="$CFGDIR/$ncp_app.cfg"
-  local backtitle="NextCloudPi installer configuration"
+  local backtitle="NextcloudPi installer configuration"
   local ret=1
 
   # checks
@@ -375,7 +375,7 @@ function info_app()
   [[ "$infotitle" == "" ]] || [[ "$infotitle" == "null" ]] && infotitle="Info"
 
   whiptail --yesno \
-	  --backtitle "NextCloudPi configuration" \
+	  --backtitle "NextcloudPi configuration" \
 	  --title "$infotitle" \
 	  --yes-button "I understand" \
 	  --no-button "Go back" \
diff --git a/etc/ncp-config.d/NFS.cfg b/etc/ncp-config.d/NFS.cfg
index cb36a8e5..b51fd9e2 100644
--- a/etc/ncp-config.d/NFS.cfg
+++ b/etc/ncp-config.d/NFS.cfg
@@ -3,7 +3,7 @@
   "name": "NFS Linux Network File System",
   "title": "NFS",
   "description": "NFS network file system server (for Linux LAN)",
-  "info": "If we intend to modify the data folder through NFS,\nthen we have to synchronize NextCloud to make it aware of the changes.\n\nThis can be done manually or automatically using 'nc-scan' and 'nc-scan-auto'",
+  "info": "If we intend to modify the data folder through NFS,\nthen we have to synchronize Nextcloud to make it aware of the changes.\n\nThis can be done manually or automatically using 'nc-scan' and 'nc-scan-auto'",
   "infotitle": "Instructions for external synchronization",
   "params": [
     {
diff --git a/etc/ncp-config.d/fail2ban.cfg b/etc/ncp-config.d/fail2ban.cfg
index d3f5d1b2..18ef38b6 100644
--- a/etc/ncp-config.d/fail2ban.cfg
+++ b/etc/ncp-config.d/fail2ban.cfg
@@ -2,7 +2,7 @@
   "id": "fail2ban",
   "name": "Fail2ban, limit brute force authentication attempts",
   "title": "fail2ban",
-  "description": "Brute force protection for SSH and NextCloud",
+  "description": "Brute force protection for SSH and Nextcloud",
   "info": "",
   "infotitle": "",
   "params": [
diff --git a/etc/ncp-config.d/l10n/NFS/pt.json b/etc/ncp-config.d/l10n/NFS/pt.json
index 49a1f7b0..2f7f7c93 100644
--- a/etc/ncp-config.d/l10n/NFS/pt.json
+++ b/etc/ncp-config.d/l10n/NFS/pt.json
@@ -6,7 +6,7 @@
      "USER":"Usuário",
      "GROUP":"Grupo",
      "NFS network file system server (for Linux LAN)":"Servidor do sistema de arquivos de rede NFS (para LAN do Linux）",
-     "If we intend to modify the data folder through NFS,\nthen we have to synchronize NextCloud to make it aware of the changes.\n\nThis can be done manually or automatically using 'nc-scan' and 'nc-scan-auto'":"Se nós pretendemos modificar a pasta de dados através do NFS, então temos que sincronizar o NextCloud para torná-lo ciente das mudanças.\n\nIsso pode ser feito manualmente ou automaticamente usando 'nc-scan' e 'nc-scan-auto",
+     "If we intend to modify the data folder through NFS,\nthen we have to synchronize Nextcloud to make it aware of the changes.\n\nThis can be done manually or automatically using 'nc-scan' and 'nc-scan-auto'":"Se nós pretendemos modificar a pasta de dados através do NFS, então temos que sincronizar o Nextcloud para torná-lo ciente das mudanças.\n\nIsso pode ser feito manualmente ou automaticamente usando 'nc-scan' e 'nc-scan-auto",
      "Run":"Executar"
    }
  }
diff --git a/etc/ncp-config.d/l10n/NFS/zh.json b/etc/ncp-config.d/l10n/NFS/zh.json
index f4a4769b..7c75f486 100644
--- a/etc/ncp-config.d/l10n/NFS/zh.json
+++ b/etc/ncp-config.d/l10n/NFS/zh.json
@@ -6,7 +6,7 @@
      "USER":"使用者",
      "GROUP":"組別",
      "NFS network file system server (for Linux LAN)":"NFS網路檔案系統（Linux LAN）",
-     "If we intend to modify the data folder through NFS,\nthen we have to synchronize NextCloud to make it aware of the changes.\n\nThis can be done manually or automatically using 'nc-scan' and 'nc-scan-auto'":"您若開啟NFS功能，那麼請您開啟'nc-scan'或'nc-scan-auto'來更新您的Nextcloud數據文件紀錄。",
+     "If we intend to modify the data folder through NFS,\nthen we have to synchronize Nextcloud to make it aware of the changes.\n\nThis can be done manually or automatically using 'nc-scan' and 'nc-scan-auto'":"您若開啟NFS功能，那麼請您開啟'nc-scan'或'nc-scan-auto'來更新您的Nextcloud數據文件紀錄。",
      "Run":"儲存"
    }
  }
diff --git a/etc/ncp-config.d/l10n/fail2ban/zh.json b/etc/ncp-config.d/l10n/fail2ban/zh.json
index f4f40f1c..dd4cde89 100644
--- a/etc/ncp-config.d/l10n/fail2ban/zh.json
+++ b/etc/ncp-config.d/l10n/fail2ban/zh.json
@@ -5,7 +5,7 @@
     "MAXRETRY":"最大重試次數",
     "EMAIL":"郵件提醒",
     "MAILALERTS":"郵件警報",
-    "Brute force protection for SSH and NextCloud":"封鎖SSH多次登入錯誤IP",
+    "Brute force protection for SSH and Nextcloud":"封鎖SSH多次登入錯誤IP",
     "fail2ban":"fail2ban",
     "Run":"儲存"
     }
diff --git a/etc/ncp-config.d/l10n/modsecurity/es.json b/etc/ncp-config.d/l10n/modsecurity/es.json
index 408cdbe0..71b73ed5 100644
--- a/etc/ncp-config.d/l10n/modsecurity/es.json
+++ b/etc/ncp-config.d/l10n/modsecurity/es.json
@@ -2,7 +2,7 @@
     "translations": {
         "ACTIVE": "Activado",
         "Experimental feature warning": "Aviso de característica experimental",
-        "This feature is highly experimental and has only been tested with\na basic NextCloud installation. If a new App does not work disable it": "Esta característica es altamente experimental y tan solo ha sido testeada contra\nuna instalación de Nextcloud básica. Si alguna App no funciona correctamente, deshabilítalo",
+        "This feature is highly experimental and has only been tested with\na basic Nextcloud installation. If a new App does not work disable it": "Esta característica es altamente experimental y tan solo ha sido testeada contra\nuna instalación de Nextcloud básica. Si alguna App no funciona correctamente, deshabilítalo",
         "Web Application Firewall for extra security (experimental)": "Web Application Firewall para una mayor seguridad (experimental)",
         "modsecurity": "modsecurity"
     }
diff --git a/etc/ncp-config.d/l10n/modsecurity/pt.json b/etc/ncp-config.d/l10n/modsecurity/pt.json
index 81345233..f999439a 100644
--- a/etc/ncp-config.d/l10n/modsecurity/pt.json
+++ b/etc/ncp-config.d/l10n/modsecurity/pt.json
@@ -2,7 +2,7 @@
     "translations": {
         "ACTIVE": "Ativo",
         "Experimental feature warning": "Aviso de característica experimental",
-        "This feature is highly experimental and has only been tested with\na basic NextCloud installation. If a new App does not work disable it": "Esta característica é altamente experimental e só foi testada com\n instalações básicas do Nextcloud. Se algum  App não funcionar corretamente, desabilita-o",
+        "This feature is highly experimental and has only been tested with\na basic Nextcloud installation. If a new App does not work disable it": "Esta característica é altamente experimental e só foi testada com\n instalações básicas do Nextcloud. Se algum  App não funcionar corretamente, desabilita-o",
         "Web Application Firewall for extra security (experimental)": "Aplicação Web de Firewall para uma maior segurança (experimental)",
         "modsecurity": "Modo segurança"
     }
diff --git a/etc/ncp-config.d/l10n/modsecurity/zh.json b/etc/ncp-config.d/l10n/modsecurity/zh.json
index 47e1edcf..5a58bd52 100644
--- a/etc/ncp-config.d/l10n/modsecurity/zh.json
+++ b/etc/ncp-config.d/l10n/modsecurity/zh.json
@@ -2,7 +2,7 @@
     "translations": {
         "ACTIVE": "開啟",
         "Experimental feature warning": "注意，這是測試功能!",
-        "This feature is highly experimental and has only been tested with\na basic NextCloud installation. If a new App does not work disable it": "這個功能我們只有在基本的NextCloud進行過測試\n如果因開啟而導致某些功能無法運作，請將它停用",
+        "This feature is highly experimental and has only been tested with\na basic Nextcloud installation. If a new App does not work disable it": "這個功能我們只有在基本的Nextcloud進行過測試\n如果因開啟而導致某些功能無法運作，請將它停用",
         "Web Application Firewall for extra security (experimental)": "網頁中的防火牆(額外的安全性)",
         "modsecurity": "modsecurity",
         "Run":"儲存"
diff --git a/etc/ncp-config.d/l10n/nc-automount/zh.json b/etc/ncp-config.d/l10n/nc-automount/zh.json
index 2e01bec7..2e49f0cb 100644
--- a/etc/ncp-config.d/l10n/nc-automount/zh.json
+++ b/etc/ncp-config.d/l10n/nc-automount/zh.json
@@ -3,7 +3,7 @@
     "Automount USB drives by plugging them in":"自動掛載USB裝置",
     "ACTIVE":"開啟",
     "Plugged in USB drives will be automounted under /media\non boot or at the moment of insertion.\n\nFormat your drive as ext4 in order to move NC datafolder or database\nVFAT or NTFS is not recommended for this task, as it does not suport permissions\n\nIMPORTANT: halt or umount the drive before extracting":
-        "開啟此功能後，插入USB後會自動掛載在/media資料夾\n若要使用此USB來修改NextCloud的用戶資料位置及資料庫，建議格式化為ext4\n建議不要格式化為VFAT和NTFS，NextcloudPi不支援權限。\n\n**若要移除USB，請將Raspberry Pi 關機或使用安全移除USB功能(commands)，以防止系統錯誤及資料遺失**",
+        "開啟此功能後，插入USB後會自動掛載在/media資料夾\n若要使用此USB來修改Nextcloud的用戶資料位置及資料庫，建議格式化為ext4\n建議不要格式化為VFAT和NTFS，NextcloudPi不支援權限。\n\n**若要移除USB，請將Raspberry Pi 關機或使用安全移除USB功能(commands)，以防止系統錯誤及資料遺失**",
     "nc-automount":"掛載USB"
     }
 }
diff --git a/etc/ncp-config.d/l10n/nc-autoupdate-ncp/zh.json b/etc/ncp-config.d/l10n/nc-autoupdate-ncp/zh.json
index 0a47c89a..19427cd6 100644
--- a/etc/ncp-config.d/l10n/nc-autoupdate-ncp/zh.json
+++ b/etc/ncp-config.d/l10n/nc-autoupdate-ncp/zh.json
@@ -1,7 +1,7 @@
 {
     "translations":{
         "ACTIVE":"開啟",
-        "Automatically apply NextCloudPi updates":"自動更新NextcloudPi",
+        "Automatically apply NextcloudPi updates":"自動更新NextcloudPi",
         "nc-autoupdate-ncp":"自動更新NCP"
     }
 }
diff --git a/etc/ncp-config.d/l10n/nc-export-ncp/es.json b/etc/ncp-config.d/l10n/nc-export-ncp/es.json
index 7dfd6215..33200f63 100644
--- a/etc/ncp-config.d/l10n/nc-export-ncp/es.json
+++ b/etc/ncp-config.d/l10n/nc-export-ncp/es.json
@@ -1,7 +1,7 @@
 {
     "translations": {
         "DIR": "Directorio",
-        "Export NextCloudPi configuration": "Exportar la configuración de NextCloudPi",
+        "Export NextcloudPi configuration": "Exportar la configuración de NextcloudPi",
         "nc-export-ncp": "nc-export-ncp"
     }
 }
diff --git a/etc/ncp-config.d/l10n/nc-export-ncp/pt.json b/etc/ncp-config.d/l10n/nc-export-ncp/pt.json
index 5a6c7d1c..12419a3a 100644
--- a/etc/ncp-config.d/l10n/nc-export-ncp/pt.json
+++ b/etc/ncp-config.d/l10n/nc-export-ncp/pt.json
@@ -1,7 +1,7 @@
 {
     "translations": {
         "DIR": "Diretório",
-        "Export NextCloudPi configuration": "Exportar configurações do NextCloudPi",
+        "Export NextcloudPi configuration": "Exportar configurações do NextcloudPi",
         "nc-export-ncp": "nc-exportar-ncp"
     }
 }
diff --git a/etc/ncp-config.d/l10n/nc-export-ncp/zh.json b/etc/ncp-config.d/l10n/nc-export-ncp/zh.json
index ede28c0f..b3283fce 100644
--- a/etc/ncp-config.d/l10n/nc-export-ncp/zh.json
+++ b/etc/ncp-config.d/l10n/nc-export-ncp/zh.json
@@ -1,7 +1,7 @@
 {
     "translations": {
         "DIR": "位置",
-        "Export NextCloudPi configuration": "匯出NextCloudPi設定",
+        "Export NextcloudPi configuration": "匯出NextcloudPi設定",
         "nc-export-ncp": "匯出NCP設定"
     }
 }
diff --git a/etc/ncp-config.d/l10n/nc-forward-ports/es.json b/etc/ncp-config.d/l10n/nc-forward-ports/es.json
index aea32821..2fe52747 100644
--- a/etc/ncp-config.d/l10n/nc-forward-ports/es.json
+++ b/etc/ncp-config.d/l10n/nc-forward-ports/es.json
@@ -1,6 +1,6 @@
 {
     "translations": {
-        "For NextCloudPi to be able to setup your ports, UPnP must be activated\nin your router. Activate it now on your router admin webpage.\n\n** UPnP is considered a security risk **\n\nDon't forget to disable it afterwards": "Para que NextCloudPi sea capaz de configurar tus puertos, UPnP debe estar activado\nen tu router. Actívalo ahora en la página de administración de tu router\n\n** UPnP se considera un riesgo de seguridad\n\nNo olvides deshabilitarlo más tarde",
+        "For NextcloudPi to be able to setup your ports, UPnP must be activated\nin your router. Activate it now on your router admin webpage.\n\n** UPnP is considered a security risk **\n\nDon't forget to disable it afterwards": "Para que NextcloudPi sea capaz de configurar tus puertos, UPnP debe estar activado\nen tu router. Actívalo ahora en la página de administración de tu router\n\n** UPnP se considera un riesgo de seguridad\n\nNo olvides deshabilitarlo más tarde",
         "HTTPPORT": "Puerto HTTP",
         "HTTPSPORT": "Puerto HTTPS",
         "Instructions for UPnP Port Forwarding": "Instrucciones para UPnP Port Forwarding",
diff --git a/etc/ncp-config.d/l10n/nc-forward-ports/pt.json b/etc/ncp-config.d/l10n/nc-forward-ports/pt.json
index 1230a8c6..5546701b 100644
--- a/etc/ncp-config.d/l10n/nc-forward-ports/pt.json
+++ b/etc/ncp-config.d/l10n/nc-forward-ports/pt.json
@@ -1,6 +1,6 @@
 {
     "translations": {
-        "For NextCloudPi to be able to setup your ports, UPnP must be activated\nin your router. Activate it now on your router admin webpage.\n\n** UPnP is considered a security risk **\n\nDon't forget to disable it afterwards": "Para o NextCloudPi conseguir configurar as portas, UPnp deve estar ativo\nno seu Roteador.A ativação é feita na pagina de Web administração do seu roteador\n\n**UPnP é considerado um risco de segurança**\n\nNão esqueça de desativá-lo depois.",
+        "For NextcloudPi to be able to setup your ports, UPnP must be activated\nin your router. Activate it now on your router admin webpage.\n\n** UPnP is considered a security risk **\n\nDon't forget to disable it afterwards": "Para o NextcloudPi conseguir configurar as portas, UPnp deve estar ativo\nno seu Roteador.A ativação é feita na pagina de Web administração do seu roteador\n\n**UPnP é considerado um risco de segurança**\n\nNão esqueça de desativá-lo depois.",
         "HTTPPORT": "Porta http",
         "HTTPSPORT": "Porta https",
         "nc-forward-ports": "nc-portas-encaminhadas (UPnP)",
diff --git a/etc/ncp-config.d/l10n/nc-forward-ports/zh.json b/etc/ncp-config.d/l10n/nc-forward-ports/zh.json
index 3d655309..86a19359 100644
--- a/etc/ncp-config.d/l10n/nc-forward-ports/zh.json
+++ b/etc/ncp-config.d/l10n/nc-forward-ports/zh.json
@@ -1,6 +1,6 @@
 {
     "translations": {
-        "For NextCloudPi to be able to setup your ports, UPnP must be activated\nin your router. Activate it now on your router admin webpage.\n\n** UPnP is considered a security risk **\n\nDon't forget to disable it afterwards": "如果要讓NextCloudPi自動設置您的Port，請在您的路由器開啟UPnP\n因鑒於安全性等問題，請在設定成功後關閉UPnP",
+        "For NextcloudPi to be able to setup your ports, UPnP must be activated\nin your router. Activate it now on your router admin webpage.\n\n** UPnP is considered a security risk **\n\nDon't forget to disable it afterwards": "如果要讓NextcloudPi自動設置您的Port，請在您的路由器開啟UPnP\n因鑒於安全性等問題，請在設定成功後關閉UPnP",
         "HTTPPORT": "http Port",
         "HTTPSPORT": "https Port",
         "nc-forward-ports": "端口轉發（UPnP）",
diff --git a/etc/ncp-config.d/l10n/nc-import-ncp/es.json b/etc/ncp-config.d/l10n/nc-import-ncp/es.json
index 75bcc246..60c09dc6 100644
--- a/etc/ncp-config.d/l10n/nc-import-ncp/es.json
+++ b/etc/ncp-config.d/l10n/nc-import-ncp/es.json
@@ -1,7 +1,7 @@
 {
     "translations": {
         "FILE": "Fichero",
-        "Import NextCloudPi configuration from file": "Importa la configuración de NextCloudPi desde un fichero",
+        "Import NextcloudPi configuration from file": "Importa la configuración de NextcloudPi desde un fichero",
         "nc-import-ncp": "nc-import-ncp"
     }
 }
diff --git a/etc/ncp-config.d/l10n/nc-import-ncp/pt.json b/etc/ncp-config.d/l10n/nc-import-ncp/pt.json
index c5bd896b..a519f9fc 100644
--- a/etc/ncp-config.d/l10n/nc-import-ncp/pt.json
+++ b/etc/ncp-config.d/l10n/nc-import-ncp/pt.json
@@ -1,7 +1,7 @@
 {
     "translations": {
         "FILE": "Arquivo",
-        "Import NextCloudPi configuration from file": "Importar  a configuração do  NextCloudPi de um arquivo",
+        "Import NextcloudPi configuration from file": "Importar  a configuração do  NextcloudPi de um arquivo",
         "nc-import-ncp": "nc-importa-ncp"
     }
 }
diff --git a/etc/ncp-config.d/l10n/nc-import-ncp/zh.json b/etc/ncp-config.d/l10n/nc-import-ncp/zh.json
index 4d0e134a..7623f135 100644
--- a/etc/ncp-config.d/l10n/nc-import-ncp/zh.json
+++ b/etc/ncp-config.d/l10n/nc-import-ncp/zh.json
@@ -1,7 +1,7 @@
 {
     "translations": {
         "FILE": "檔案位置",
-        "Import NextCloudPi configuration from file": "匯入NextCloudPi設定",
+        "Import NextcloudPi configuration from file": "匯入NextcloudPi設定",
         "nc-import-ncp": "匯入NCP設定"
     }
 }
diff --git a/etc/ncp-config.d/l10n/nc-info/es.json b/etc/ncp-config.d/l10n/nc-info/es.json
index 6bfc5546..0ddd1ffc 100644
--- a/etc/ncp-config.d/l10n/nc-info/es.json
+++ b/etc/ncp-config.d/l10n/nc-info/es.json
@@ -1,6 +1,6 @@
 {
     "translations": {
-        "Print NextCloudPi system info": "Muestra información de sistema de NCP",
+        "Print NextcloudPi system info": "Muestra información de sistema de NCP",
         "nc-info": "nc-info"
     }
 }
diff --git a/etc/ncp-config.d/l10n/nc-info/pt.json b/etc/ncp-config.d/l10n/nc-info/pt.json
index e85a06f0..ecf3e824 100644
--- a/etc/ncp-config.d/l10n/nc-info/pt.json
+++ b/etc/ncp-config.d/l10n/nc-info/pt.json
@@ -1,6 +1,6 @@
 {
     "translations": {
-        "Print NextCloudPi system info": "Imprime informações do sistema NextCloudPi",
+        "Print NextcloudPi system info": "Imprime informações do sistema NextcloudPi",
         "nc-info": "nc-info"
     }
 }
diff --git a/etc/ncp-config.d/l10n/nc-info/zh.json b/etc/ncp-config.d/l10n/nc-info/zh.json
index fd3fea2c..12ce80a3 100644
--- a/etc/ncp-config.d/l10n/nc-info/zh.json
+++ b/etc/ncp-config.d/l10n/nc-info/zh.json
@@ -1,6 +1,6 @@
 {
     "translations": {
-        "Print NextCloudPi system info": "顯示NextCloudPi系統信息",
+        "Print NextcloudPi system info": "顯示NextcloudPi系統信息",
         "nc-info": "NCP系統訊息"
     }
 }
diff --git a/etc/ncp-config.d/l10n/nc-init/zh.json b/etc/ncp-config.d/l10n/nc-init/zh.json
index 8e3e2e2a..3e72238f 100644
--- a/etc/ncp-config.d/l10n/nc-init/zh.json
+++ b/etc/ncp-config.d/l10n/nc-init/zh.json
@@ -1,7 +1,7 @@
 {
     "translations":{
         "(Re)initiate Nextcloud to a clean configuration":"初始化Nextcloud",
-        "This action will configure NextCloud to NextCloudPi defaults.\n\n** YOUR CONFIGURATION WILL BE LOST **\n\n":"重設後將使用預設文件配置(NextcloudPi)\n**您所有的資料及設定將會刪除並無法復原**",
+        "This action will configure Nextcloud to NextcloudPi defaults.\n\n** YOUR CONFIGURATION WILL BE LOST **\n\n":"重設後將使用預設文件配置(NextcloudPi)\n**您所有的資料及設定將會刪除並無法復原**",
         "ADMINUSER":"管理員",
         "ADMINPASS":"管理員密碼",
         "nc-init":"初始化NC"
diff --git a/etc/ncp-config.d/l10n/nc-limits/es.json b/etc/ncp-config.d/l10n/nc-limits/es.json
index ddf6529c..33709c31 100644
--- a/etc/ncp-config.d/l10n/nc-limits/es.json
+++ b/etc/ncp-config.d/l10n/nc-limits/es.json
@@ -1,6 +1,6 @@
 {
     "translations": {
-        "Configure system limits for NextCloudPi": "Configura los límites de sistema para NextCloudPi",
+        "Configure system limits for NextcloudPi": "Configura los límites de sistema para NextcloudPi",
         "MAXFILESIZE":"Tamaño máximo de archivo en subida",
         "MEMORYLIMIT": "Límite de memoria",
         "PHPTHREADS": "Hilos PHP",
diff --git a/etc/ncp-config.d/l10n/nc-limits/pt.json b/etc/ncp-config.d/l10n/nc-limits/pt.json
index fe3eae51..f498f26e 100644
--- a/etc/ncp-config.d/l10n/nc-limits/pt.json
+++ b/etc/ncp-config.d/l10n/nc-limits/pt.json
@@ -1,6 +1,6 @@
 {
     "translations": {
-        "Configure system limits for NextCloudPi": "Configura os limites de sistema para NextCloudPi",
+        "Configure system limits for NextcloudPi": "Configura os limites de sistema para NextcloudPi",
         "MAXFILESIZE":"Tamanho máximo de arquivo para upload",
         "MEMORYLIMIT": "Limite  de memória",
         "PHPTHREADS": "THREADS PHP",
diff --git a/etc/ncp-config.d/l10n/nc-limits/zh.json b/etc/ncp-config.d/l10n/nc-limits/zh.json
index 3a9a187d..a3d59b87 100644
--- a/etc/ncp-config.d/l10n/nc-limits/zh.json
+++ b/etc/ncp-config.d/l10n/nc-limits/zh.json
@@ -1,6 +1,6 @@
 {
     "translations": {
-        "Configure system limits for NextCloudPi": "設定NextCloudPi的系統限制",
+        "Configure system limits for NextcloudPi": "設定NextcloudPi的系統限制",
         "MAXFILESIZE": "最大文件大小（<=2G）",
         "MEMORYLIMIT": "內存限制",
         "PHPTHREADS": "PHP線程",
diff --git a/etc/ncp-config.d/l10n/nc-nextcloud/pt.json b/etc/ncp-config.d/l10n/nc-nextcloud/pt.json
index c6234a14..38c6f613 100644
--- a/etc/ncp-config.d/l10n/nc-nextcloud/pt.json
+++ b/etc/ncp-config.d/l10n/nc-nextcloud/pt.json
@@ -5,9 +5,9 @@
     "MAXFILESIZE":"Tamanho Maximo de upload",
     "MEMORYLIMIT":"Limíte de Memória",
     "MAXTRANSFERTIME":"Tempo máximo de transferência",
-    "NextCloud installation":"Instalação NextCloud",
-    "This new installation will cleanup current\nNextCloud instance, including files and database.\n\nYou can later use nc-init to configure to NextCloudPi defaults\n\n** perform backup before proceding **\n\nYou can use nc-backup ":"Esta nova instalação irá apagar a instância atual\ndo NextCloud, incluindo os arquivos e o Banco de Dados.\nVocê depois pode usar o nc-init para configurar os padrões do NextCloudPi\n\n**Realize Backup antes de Continuar**\n\nVocê pode usar o nc-backup",
+    "Nextcloud installation":"Instalação Nextcloud",
+    "This new installation will cleanup current\nNextcloud instance, including files and database.\n\nYou can later use nc-init to configure to NextcloudPi defaults\n\n** perform backup before proceding **\n\nYou can use nc-backup ":"Esta nova instalação irá apagar a instância atual\ndo Nextcloud, incluindo os arquivos e o Banco de Dados.\nVocê depois pode usar o nc-init para configurar os padrões do NextcloudPi\n\n**Realize Backup antes de Continuar**\n\nVocê pode usar o nc-backup",
     "nc-nextcloud":"nc-nextcloud",
-    "Install any NextCloud version":"Instalar qualquer versão NextCloud"
+    "Install any Nextcloud version":"Instalar qualquer versão Nextcloud"
   }
 }
diff --git a/etc/ncp-config.d/l10n/nc-nextcloud/zh.json b/etc/ncp-config.d/l10n/nc-nextcloud/zh.json
index 373ade49..5c73bf4e 100644
--- a/etc/ncp-config.d/l10n/nc-nextcloud/zh.json
+++ b/etc/ncp-config.d/l10n/nc-nextcloud/zh.json
@@ -5,9 +5,9 @@
     "MAXFILESIZE":"最大檔案大小",
     "MEMORYLIMIT":"記憶體限制",
     "MAXTRANSFERTIME":"最大傳輸時間",
-    "NextCloud installation":"重新下載安裝NextCloud",
-    "This new installation will cleanup current\nNextCloud instance, including files and database.\n\nYou can later use nc-init to configure to NextCloudPi defaults\n\n** perform backup before proceding **\n\nYou can use nc-backup ":"這個動作安裝將清理目前NextCloud的所有內容，所有的文件及數據庫都將會被刪除\n安裝完後您可以使用初始化NextCloud來快速設定回系統默認值以及資料庫\n或者您可以在開始動作前先進行備份(NC備份)",
+    "Nextcloud installation":"重新下載安裝Nextcloud",
+    "This new installation will cleanup current\nNextcloud instance, including files and database.\n\nYou can later use nc-init to configure to NextcloudPi defaults\n\n** perform backup before proceding **\n\nYou can use nc-backup ":"這個動作安裝將清理目前Nextcloud的所有內容，所有的文件及數據庫都將會被刪除\n安裝完後您可以使用初始化Nextcloud來快速設定回系統默認值以及資料庫\n或者您可以在開始動作前先進行備份(NC備份)",
     "nc-nextcloud":"重新安裝NC",
-    "Install any NextCloud version":"下載安裝NextCloud"
+    "Install any Nextcloud version":"下載安裝Nextcloud"
   }
 }
diff --git a/etc/ncp-config.d/l10n/nc-notify-updates/pt.json b/etc/ncp-config.d/l10n/nc-notify-updates/pt.json
index 0e9bbd10..8b00ebc3 100644
--- a/etc/ncp-config.d/l10n/nc-notify-updates/pt.json
+++ b/etc/ncp-config.d/l10n/nc-notify-updates/pt.json
@@ -2,7 +2,7 @@
     "translations":{
         "ACTIVE":"Ativo",
         "USER":"Usuário",
-        "Notify in NC when a NextCloudPi update is available":"Notifica no NC quando uma atualização NextCloudPi está disponível",
+        "Notify in NC when a NextcloudPi update is available":"Notifica no NC quando uma atualização NextcloudPi está disponível",
         "nc-notify-updates":"nc-notificar-atualizações"
     }
 }
diff --git a/etc/ncp-config.d/l10n/nc-notify-updates/zh.json b/etc/ncp-config.d/l10n/nc-notify-updates/zh.json
index 3b7402c8..199c2ebb 100644
--- a/etc/ncp-config.d/l10n/nc-notify-updates/zh.json
+++ b/etc/ncp-config.d/l10n/nc-notify-updates/zh.json
@@ -2,7 +2,7 @@
     "translations":{
         "ACTIVE":"開啟",
         "USER":"使用者",
-        "Notify in NC when a NextCloudPi update is available":"在NextcloudPi需要更新時在Nextcloud通知您",
+        "Notify in NC when a NextcloudPi update is available":"在NextcloudPi需要更新時在Nextcloud通知您",
         "nc-notify-updates":"NCP更新通知"
     }
 }
diff --git a/etc/ncp-config.d/l10n/nc-passwd/es.json b/etc/ncp-config.d/l10n/nc-passwd/es.json
index f0b73aa2..8cdd597c 100644
--- a/etc/ncp-config.d/l10n/nc-passwd/es.json
+++ b/etc/ncp-config.d/l10n/nc-passwd/es.json
@@ -1,7 +1,7 @@
 {
     "translations": {
         "CONFIRM": "Confirmar",
-        "Change password for the NextCloudPi Panel": "Cambiar la contraseña para el Panel de NextCloudPi",
+        "Change password for the NextcloudPi Panel": "Cambiar la contraseña para el Panel de NextcloudPi",
         "PASSWORD": "Contraseña",
         "nc-passwd": "nc-passwd"
     }
diff --git a/etc/ncp-config.d/l10n/nc-passwd/pt.json b/etc/ncp-config.d/l10n/nc-passwd/pt.json
index 473921fe..f4b83610 100644
--- a/etc/ncp-config.d/l10n/nc-passwd/pt.json
+++ b/etc/ncp-config.d/l10n/nc-passwd/pt.json
@@ -1,6 +1,6 @@
 {
   "translations":{
-    "Change password for the NextCloudPi Panel":"Mudar a senha para o painel NextCloudPi",
+    "Change password for the NextcloudPi Panel":"Mudar a senha para o painel NextcloudPi",
     "nc-passwd":"nc-senha",
     "PASSWORD":"Senha",
     "CONFIRM":"Confirmar"
diff --git a/etc/ncp-config.d/l10n/nc-passwd/zh.json b/etc/ncp-config.d/l10n/nc-passwd/zh.json
index 57d526f4..f9b609b2 100644
--- a/etc/ncp-config.d/l10n/nc-passwd/zh.json
+++ b/etc/ncp-config.d/l10n/nc-passwd/zh.json
@@ -1,6 +1,6 @@
 {
   "translations":{
-    "Change password for the NextCloudPi Panel":"修改NextCloudPi網頁介面的密碼",
+    "Change password for the NextcloudPi Panel":"修改NextcloudPi網頁介面的密碼",
     "nc-passwd":"修改NCP密碼",
     "PASSWORD":"密碼",
     "CONFIRM":"再次輸入密碼"
diff --git a/etc/ncp-config.d/l10n/nc-restore/es.json b/etc/ncp-config.d/l10n/nc-restore/es.json
index 977aec85..1a67062e 100644
--- a/etc/ncp-config.d/l10n/nc-restore/es.json
+++ b/etc/ncp-config.d/l10n/nc-restore/es.json
@@ -1,9 +1,9 @@
 {
     "translations": {
         "BACKUPFILE": "Archivo de backup",
-        "Restore NextCloud backup": "Restaurar backup de Nextcloud",
+        "Restore Nextcloud backup": "Restaurar backup de Nextcloud",
         "Restore a previously backuped NC instance": "Restaurar una instancia previamente guardada",
-        "This new installation will cleanup current\nNextCloud instance, including files and database.\n\n** perform backup before proceding **\n\nYou can use nc-backup": "Esta nueva instalación borrará la actual\ninstancia de Nextcloud, incluyendo archivos y base de datos\n\n** Realiza una copia de seguridad antes de proceder **\n\nPuedes usar nc-backup",
+        "This new installation will cleanup current\nNextcloud instance, including files and database.\n\n** perform backup before proceding **\n\nYou can use nc-backup": "Esta nueva instalación borrará la actual\ninstancia de Nextcloud, incluyendo archivos y base de datos\n\n** Realiza una copia de seguridad antes de proceder **\n\nPuedes usar nc-backup",
         "nc-restore": "nc-restore"
     }
 }
diff --git a/etc/ncp-config.d/l10n/nc-restore/pt.json b/etc/ncp-config.d/l10n/nc-restore/pt.json
index bc08229f..a5352218 100644
--- a/etc/ncp-config.d/l10n/nc-restore/pt.json
+++ b/etc/ncp-config.d/l10n/nc-restore/pt.json
@@ -1,9 +1,9 @@
 {
     "translations": {
         "BACKUPFILE": "Arquivo de backup",
-        "Restore NextCloud backup": "Restaurar backup do Nextcloud",
+        "Restore Nextcloud backup": "Restaurar backup do Nextcloud",
         "Restore a previously backuped NC instance": "Restaurar uma instâcia previamente guardada",
-        "This new installation will cleanup current\nNextCloud instance, including files and database.\n\n** perform backup before proceding **\n\nYou can use nc-backup": "Esta nova instalação limpará a instância atual\ndo Nextcloud, incluindo arquivos e Base de Dados\n\n** Realize uma cópia de segurança antes de proceder **\n\nVocê pode usar nc-backup",
+        "This new installation will cleanup current\nNextcloud instance, including files and database.\n\n** perform backup before proceding **\n\nYou can use nc-backup": "Esta nova instalação limpará a instância atual\ndo Nextcloud, incluindo arquivos e Base de Dados\n\n** Realize uma cópia de segurança antes de proceder **\n\nVocê pode usar nc-backup",
         "nc-restore": "nc-restauração"
     }
 }
diff --git a/etc/ncp-config.d/l10n/nc-restore/zh.json b/etc/ncp-config.d/l10n/nc-restore/zh.json
index 3dc64c14..6e23a2e0 100644
--- a/etc/ncp-config.d/l10n/nc-restore/zh.json
+++ b/etc/ncp-config.d/l10n/nc-restore/zh.json
@@ -2,7 +2,7 @@
     "translations": {
         "BACKUPFILE": "檔案位置",
         "Restore a previously backuped NC instance": "恢復Nextcloud備份",
-        "This new installation will cleanup current\nNextCloud instance, including files and database.\n\n** perform backup before proceding **\n\nYou can use nc-backup": "這個動作將清除目前正使用的NextCloud，包括文件和數據庫。\n\n**您可以在開始動作之前使用nc-backup**",
+        "This new installation will cleanup current\nNextcloud instance, including files and database.\n\n** perform backup before proceding **\n\nYou can use nc-backup": "這個動作將清除目前正使用的Nextcloud，包括文件和數據庫。\n\n**您可以在開始動作之前使用nc-backup**",
         "nc-restore": "恢復NC備份"
     }
 }
diff --git a/etc/ncp-config.d/l10n/nc-rsync-auto/pt.json b/etc/ncp-config.d/l10n/nc-rsync-auto/pt.json
index a2fff54d..dc9f1563 100644
--- a/etc/ncp-config.d/l10n/nc-rsync-auto/pt.json
+++ b/etc/ncp-config.d/l10n/nc-rsync-auto/pt.json
@@ -3,7 +3,7 @@
     "ACTIVE":"Ativo",
     "DESTINATION":"Destino",
     "SYNCDAYS":"Dias de sincronização",
-    "Periodically sync Nextcloud data through rsync":"Sincronize periodicamente os dados do NextCloud através do rsync",
+    "Periodically sync Nextcloud data through rsync":"Sincronize periodicamente os dados do Nextcloud através do rsync",
     "DESTINATION can be a regular path for local sync\n'user' needs SSH autologin from the NCP 'root' user at 'ip'":"o Destino pode ser um caminho regular para a sincronização local\n'user' precisa de autenticação SSH do usuário 'root' do NCP em 'ip'",
     "nc-rsync-auto":"nc-rsync-automático"
   }
diff --git a/etc/ncp-config.d/l10n/nc-scan-auto/zh.json b/etc/ncp-config.d/l10n/nc-scan-auto/zh.json
index ae06cc2d..1f5cb39a 100644
--- a/etc/ncp-config.d/l10n/nc-scan-auto/zh.json
+++ b/etc/ncp-config.d/l10n/nc-scan-auto/zh.json
@@ -2,9 +2,9 @@
   "translations":{
     "ACTIVE":"開啟",
     "SCANINTERVAL":"掃瞄間隔時間",
-    "Periodically scan NC for externally modified files":"定期檢查更新NextCloud使用者數據修改",
+    "Periodically scan NC for externally modified files":"定期檢查更新Nextcloud使用者數據修改",
     "Set the time in minutes in SCANINTERVAL.\n\n>>> If there are too many files this can greatly affect performance. <<<":"''掃描間隔時間''的單位是分鐘\n>>>如果文件過多，可能將影響效能<<<",
     "nc-scan-auto":"定期掃描NC使用者文件"
-    
+
   }
 }
diff --git a/etc/ncp-config.d/l10n/nc-scan/zh.json b/etc/ncp-config.d/l10n/nc-scan/zh.json
index e18f31bc..b4fbc11f 100644
--- a/etc/ncp-config.d/l10n/nc-scan/zh.json
+++ b/etc/ncp-config.d/l10n/nc-scan/zh.json
@@ -1,7 +1,7 @@
 {
   "translations":{
-  "Scan NC for externally modified files":"掃描NextCloud使用者數據來檢查並更新",
+  "Scan NC for externally modified files":"掃描Nextcloud使用者數據來檢查並更新",
   "nc-scan":"掃描NC使用者文件"
-    
+
   }
 }
diff --git a/etc/ncp-config.d/l10n/nc-update/pt.json b/etc/ncp-config.d/l10n/nc-update/pt.json
index 16c563b7..d4d313f2 100644
--- a/etc/ncp-config.d/l10n/nc-update/pt.json
+++ b/etc/ncp-config.d/l10n/nc-update/pt.json
@@ -1,6 +1,6 @@
 {
   "translations":{
-  "Update NextCloudPi":"atualização NextCloudPi",
+  "Update NextcloudPi":"atualização NextcloudPi",
   "nc-update":"nc-atualização"
   }
 }
diff --git a/etc/ncp-config.d/l10n/nc-update/zh.json b/etc/ncp-config.d/l10n/nc-update/zh.json
index da24955f..ed52b2d0 100644
--- a/etc/ncp-config.d/l10n/nc-update/zh.json
+++ b/etc/ncp-config.d/l10n/nc-update/zh.json
@@ -1,6 +1,6 @@
 {
   "translations":{
-  "Update NextCloudPi":"更新NextCloudPi",
+  "Update NextcloudPi":"更新NextcloudPi",
   "nc-update":"更新NCP"
   }
 }
diff --git a/etc/ncp-config.d/modsecurity.cfg b/etc/ncp-config.d/modsecurity.cfg
index 87fdb876..ce826574 100644
--- a/etc/ncp-config.d/modsecurity.cfg
+++ b/etc/ncp-config.d/modsecurity.cfg
@@ -3,7 +3,7 @@
   "name": "modsecurity",
   "title": "modsecurity",
   "description": "Web Application Firewall for extra security (experimental)",
-  "info": "This feature is highly experimental and has only been tested with\na basic NextCloud installation. If a new App does not work disable it",
+  "info": "This feature is highly experimental and has only been tested with\na basic Nextcloud installation. If a new App does not work disable it",
   "infotitle": "Experimental feature warning",
   "params": [
     {
diff --git a/etc/ncp-config.d/nc-autoupdate-ncp.cfg b/etc/ncp-config.d/nc-autoupdate-ncp.cfg
index 80d2e77e..2b6ffb1b 100644
--- a/etc/ncp-config.d/nc-autoupdate-ncp.cfg
+++ b/etc/ncp-config.d/nc-autoupdate-ncp.cfg
@@ -2,7 +2,7 @@
   "id": "nc-autoupdate-ncp",
   "name": "Nc-autoupdate-ncp",
   "title": "nc-autoupdate-ncp",
-  "description": "Automatically apply NextCloudPi updates",
+  "description": "Automatically apply NextcloudPi updates",
   "info": "",
   "infotitle": "",
   "params": [
diff --git a/etc/ncp-config.d/nc-export-ncp.cfg b/etc/ncp-config.d/nc-export-ncp.cfg
index 105824d6..59292531 100644
--- a/etc/ncp-config.d/nc-export-ncp.cfg
+++ b/etc/ncp-config.d/nc-export-ncp.cfg
@@ -2,7 +2,7 @@
   "id": "nc-export-ncp",
   "name": "Nc-export-ncp",
   "title": "nc-export-ncp",
-  "description": "Export NextCloudPi configuration",
+  "description": "Export NextcloudPi configuration",
   "info": "",
   "infotitle": "",
   "params": [
diff --git a/etc/ncp-config.d/nc-forward-ports.cfg b/etc/ncp-config.d/nc-forward-ports.cfg
index 7d285bb7..08fe1643 100644
--- a/etc/ncp-config.d/nc-forward-ports.cfg
+++ b/etc/ncp-config.d/nc-forward-ports.cfg
@@ -3,7 +3,7 @@
   "name": "Nc-forward-ports",
   "title": "nc-forward-ports",
   "description": "Set port forwarding to access from outside",
-  "info": "For NextCloudPi to be able to setup your ports, UPnP must be activated\nin your router. Activate it now on your router admin webpage.\n\n** UPnP is considered a security risk **\n\nDon't forget to disable it afterwards",
+  "info": "For NextcloudPi to be able to setup your ports, UPnP must be activated\nin your router. Activate it now on your router admin webpage.\n\n** UPnP is considered a security risk **\n\nDon't forget to disable it afterwards",
   "infotitle": "Instructions for UPnP Port Forwarding",
   "params": [
     {
diff --git a/etc/ncp-config.d/nc-import-ncp.cfg b/etc/ncp-config.d/nc-import-ncp.cfg
index 05ac8970..1ad9c6b0 100644
--- a/etc/ncp-config.d/nc-import-ncp.cfg
+++ b/etc/ncp-config.d/nc-import-ncp.cfg
@@ -2,7 +2,7 @@
   "id": "nc-import-ncp",
   "name": "Nc-import-ncp",
   "title": "nc-import-ncp",
-  "description": "Import NextCloudPi configuration from file",
+  "description": "Import NextcloudPi configuration from file",
   "info": "",
   "infotitle": "",
   "params": [
diff --git a/etc/ncp-config.d/nc-info.cfg b/etc/ncp-config.d/nc-info.cfg
index 8193350a..5303a95d 100644
--- a/etc/ncp-config.d/nc-info.cfg
+++ b/etc/ncp-config.d/nc-info.cfg
@@ -2,7 +2,7 @@
   "id": "nc-info",
   "name": "Nc-info",
   "title": "nc-info",
-  "description": "Print NextCloudPi system info",
+  "description": "Print NextcloudPi system info",
   "info": "",
   "infotitle": "",
   "params": []
diff --git a/etc/ncp-config.d/nc-init.cfg b/etc/ncp-config.d/nc-init.cfg
index 0adc1a4a..6c62fde6 100644
--- a/etc/ncp-config.d/nc-init.cfg
+++ b/etc/ncp-config.d/nc-init.cfg
@@ -3,8 +3,8 @@
   "name": "Nc-init",
   "title": "nc-init",
   "description": "(Re)initiate Nextcloud to a clean configuration",
-  "info": "This action will configure NextCloud to NextCloudPi defaults.\n\n** YOUR CONFIGURATION WILL BE LOST **\n\n",
-  "infotitle": "Clean NextCloud configuration",
+  "info": "This action will configure Nextcloud to NextcloudPi defaults.\n\n** YOUR CONFIGURATION WILL BE LOST **\n\n",
+  "infotitle": "Clean Nextcloud configuration",
   "params": [
     {
       "id": "ADMINUSER",
diff --git a/etc/ncp-config.d/nc-limits.cfg b/etc/ncp-config.d/nc-limits.cfg
index eb31282b..705d143b 100644
--- a/etc/ncp-config.d/nc-limits.cfg
+++ b/etc/ncp-config.d/nc-limits.cfg
@@ -2,7 +2,7 @@
   "id": "nc-limits",
   "name": "Nc-limits",
   "title": "nc-limits",
-  "description": "Configure system limits for NextCloudPi",
+  "description": "Configure system limits for NextcloudPi",
   "info": "Examples: 200M or 2G. Write 0 for autoconfig",
   "infotitle": "",
   "params": [
diff --git a/etc/ncp-config.d/nc-nextcloud.cfg b/etc/ncp-config.d/nc-nextcloud.cfg
index 15d301fe..f8d510a4 100644
--- a/etc/ncp-config.d/nc-nextcloud.cfg
+++ b/etc/ncp-config.d/nc-nextcloud.cfg
@@ -2,7 +2,7 @@
   "id": "nc-nextcloud",
   "name": "Nc-nextcloud",
   "title": "nc-nextcloud",
-  "description": "Install any NextCloud version",
+  "description": "Install any Nextcloud version",
   "info": "WARNING: this will completely wipe out your current instance",
   "infotitle": "",
   "params": [
diff --git a/etc/ncp-config.d/nc-notify-updates.cfg b/etc/ncp-config.d/nc-notify-updates.cfg
index 3f02f5b2..3f17b773 100644
--- a/etc/ncp-config.d/nc-notify-updates.cfg
+++ b/etc/ncp-config.d/nc-notify-updates.cfg
@@ -2,7 +2,7 @@
   "id": "nc-notify-updates",
   "name": "Nc-notify-updates",
   "title": "nc-notify-updates",
-  "description": "Notify in Nextcloud when a NextCloudPi update is available",
+  "description": "Notify in Nextcloud when a NextcloudPi update is available",
   "info": "",
   "infotitle": "",
   "params": [
diff --git a/etc/ncp-config.d/nc-passwd.cfg b/etc/ncp-config.d/nc-passwd.cfg
index 36d4b42a..9173bb1f 100644
--- a/etc/ncp-config.d/nc-passwd.cfg
+++ b/etc/ncp-config.d/nc-passwd.cfg
@@ -2,7 +2,7 @@
   "id": "nc-passwd",
   "name": "Nc-passwd",
   "title": "nc-passwd",
-  "description": "Change password for the NextCloudPi Panel",
+  "description": "Change password for the NextcloudPi Panel",
   "info": "Please note some special characters are not allowed here, avoid using ) } ; # in password",
   "infotitle": "",
   "params": [
diff --git a/etc/ncp-config.d/nc-restore-snapshot.cfg b/etc/ncp-config.d/nc-restore-snapshot.cfg
index 41b45bdc..5753c0da 100644
--- a/etc/ncp-config.d/nc-restore-snapshot.cfg
+++ b/etc/ncp-config.d/nc-restore-snapshot.cfg
@@ -4,7 +4,7 @@
   "title": "nc-restore-snapshot",
   "description": "Restore data from a BTRFS snapshot",
   "info": "A snapshot of the data will be restored",
-  "infotitle": "Restore NextCloud data snapshot",
+  "infotitle": "Restore Nextcloud data snapshot",
   "params": [
     {
       "id": "SNAPSHOT",
diff --git a/etc/ncp-config.d/nc-restore.cfg b/etc/ncp-config.d/nc-restore.cfg
index 9d9e6111..1437d6a1 100644
--- a/etc/ncp-config.d/nc-restore.cfg
+++ b/etc/ncp-config.d/nc-restore.cfg
@@ -3,8 +3,8 @@
   "name": "Nc-restore",
   "title": "nc-restore",
   "description": "Restore a previously backuped NC instance",
-  "info": "This new installation will cleanup current\nNextCloud instance, including files and database.\n\n** perform backup before proceding **\n\nYou can use 'nc-backup'",
-  "infotitle": "Restore NextCloud backup",
+  "info": "This new installation will cleanup current\nNextcloud instance, including files and database.\n\n** perform backup before proceding **\n\nYou can use 'nc-backup'",
+  "infotitle": "Restore Nextcloud backup",
   "params": [
     {
       "id": "BACKUPFILE",
diff --git a/etc/ncp-config.d/nc-update.cfg b/etc/ncp-config.d/nc-update.cfg
index 987951b5..15d5bd65 100644
--- a/etc/ncp-config.d/nc-update.cfg
+++ b/etc/ncp-config.d/nc-update.cfg
@@ -2,7 +2,7 @@
   "id": "nc-update",
   "name": "Nc-update",
   "title": "nc-update",
-  "description": "Update NextCloudPi",
+  "description": "Update NextcloudPi",
   "info": "",
   "infotitle": "",
   "params": []
diff --git a/etc/ncp-config.d/samba.cfg b/etc/ncp-config.d/samba.cfg
index 2c6b3e39..8d05371d 100644
--- a/etc/ncp-config.d/samba.cfg
+++ b/etc/ncp-config.d/samba.cfg
@@ -3,7 +3,7 @@
   "name": "Samba",
   "title": "samba",
   "description": "SMB/CIFS file server (for Mac/Linux/Windows)\nIf a group filter is given, samba shares will only be set up for users of that group.",
-  "info": "The username will be the Nextcloud username, and the password will be one we setup here.\nIf we intend to modify the data folder through SAMBA,\nthen we have to synchronize NextCloud to make it aware of the changes.\n\nThis can be done manually or automatically using 'nc-scan' and 'nc-scan-auto'",
+  "info": "The username will be the Nextcloud username, and the password will be one we setup here.\nIf we intend to modify the data folder through SAMBA,\nthen we have to synchronize Nextcloud to make it aware of the changes.\n\nThis can be done manually or automatically using 'nc-scan' and 'nc-scan-auto'",
   "infotitle": "Instructions for external synchronization",
   "params": [
     {
diff --git a/etc/ncp-templates/ncp-metrics.cfg.sh b/etc/ncp-templates/ncp-metrics.cfg.sh
index 505ccee7..e0c297b0 100644
--- a/etc/ncp-templates/ncp-metrics.cfg.sh
+++ b/etc/ncp-templates/ncp-metrics.cfg.sh
@@ -54,7 +54,7 @@ EOF
 is_docker || {
 
   DATADIR=$( get_nc_config_value datadirectory ) || {
-    echo "ERROR: Could not get data directory. Is NextCloud running?" >&2
+    echo "ERROR: Could not get data directory. Is Nextcloud running?" >&2
     return 1;
   }
   NC_SNAPSHOTS_DIR="$(dirname "$DATADIR")/ncp-snapshots"
diff --git a/i18n/README-zh_CN.md b/i18n/README-zh_CN.md
index 6b48e872..6395f6f3 100644
--- a/i18n/README-zh_CN.md
+++ b/i18n/README-zh_CN.md
@@ -1,13 +1,13 @@
 [English](/README.md) | [Traditional Chinese 繁體中文](README-zh_TW.md) | Simplified Chinese 简体中文
 
-# NextCloudPi [![chatroom icon](https://patrolavia.github.io/telegram-badge/chat.png)](https://t.me/NextCloudPi) [![forums icon](https://img.shields.io/badge/help-forums-blue.svg)](https://help.nextcloud.com/c/support/appliances-docker-snappy-vm) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=N8PJHSEQF4G7Y&lc=US&item_name=Own%20Your%20Bits&item_number=NextCloudPi&no_note=1&no_shipping=1&currency_code=EUR&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHosted) [![blog](https://img.shields.io/badge/follow-blog-orange.svg)](https://ownyourbits.com)
+# NextcloudPi [![chatroom icon](https://patrolavia.github.io/telegram-badge/chat.png)](https://t.me/NextcloudPi) [![forums icon](https://img.shields.io/badge/help-forums-blue.svg)](https://help.nextcloud.com/c/support/appliances-docker-snappy-vm) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=N8PJHSEQF4G7Y&lc=US&item_name=Own%20Your%20Bits&item_number=NextcloudPi&no_note=1&no_shipping=1&currency_code=EUR&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHosted) [![blog](https://img.shields.io/badge/follow-blog-orange.svg)](https://ownyourbits.com)
 
 
 ![NC Logo](https://ownyourbits.com/wp-content/uploads/2017/11/ncp-square.png)
 
-这里是用来构建 [NextCloudPi](https://nextcloudpi.com) 的代码。
+这里是用来构建 [NextcloudPi](https://nextcloudpi.com) 的代码。
 
-NextCloudPi 是一款适用于 Raspberry Pi、Odroid HC1、rock64 等其他板卡的现成镜像。
+NextcloudPi 是一款适用于 Raspberry Pi、Odroid HC1、rock64 等其他板卡的现成镜像。
 
 这个代码也可以用来生成 [ARM](https://hub.docker.com/r/ownyourbits/nextcloudpi-armhf) 和 [x86](https://hub.docker.com/r/ownyourbits/nextcloudpi-x86) 平台的 docker 镜像，并且包含一个适用于任何基于 Debian 系统的安装程序。
 
@@ -35,7 +35,7 @@ NextCloudPi 是一款适用于 Raspberry Pi、Odroid HC1、rock64 等其他板
 ## 额外之处
 
  * 安装向导
- * NextCloudPi Web 面板
+ * NextcloudPi Web 面板
  * 已准备好的 Wi-Fi
  * RAM 日志
  * 自动安装安全更新，默认激活
@@ -52,11 +52,11 @@ NextCloudPi 是一款适用于 Raspberry Pi、Odroid HC1、rock64 等其他板
  * 通过预装的 SAMBA 与 Windows/Mac/Linux 分享文件
  * 自动挂载 USB
  * 远程更新
- * 自动更新 NextCloudPi
- * 自动更新 NextCloud
+ * 自动更新 NextcloudPi
+ * 自动更新 Nextcloud
  * 更新通知
- * NextCloud 备份和恢复
- * NextCloud 在线安装
+ * Nextcloud 备份和恢复
+ * Nextcloud 在线安装
  * 格式化 USB 驱动器为 BTRFS
  * BTRFS 快照
  * 自动建立 BTRFS 快照
@@ -113,7 +113,7 @@ cd nextcloudpi
 ./build-docker.sh arm64
 ```
 
-NextCloudPi 可以被安装在任何架构的最新版本 Debian 系统上
+NextcloudPi 可以被安装在任何架构的最新版本 Debian 系统上
 
 ```
 # curl -sSL https://raw.githubusercontent.com/nextcloud/nextcloudpi/master/install.sh | bash
@@ -133,4 +133,4 @@ https://hub.docker.com/r/ownyourbits/nextcloudpi
 
 ## 联系
 
-你可以在 [forums](https://help.nextcloud.com/c/support/appliances-docker-snappy-vm) 和 [Telegram group](https://t.me/NextCloudPi) 找到我们
+你可以在 [forums](https://help.nextcloud.com/c/support/appliances-docker-snappy-vm) 和 [Telegram group](https://t.me/NextcloudPi) 找到我们
diff --git a/i18n/README-zh_TW.md b/i18n/README-zh_TW.md
index f906f2d6..0bf84bd8 100644
--- a/i18n/README-zh_TW.md
+++ b/i18n/README-zh_TW.md
@@ -1,16 +1,16 @@
 [English](/README.md) | Traditional Chinese 繁體中文 | [Simplified Chinese 简体中文](README-zh_CN.md)
 
 
-# NextCloudPi [![chatroom icon](https://patrolavia.github.io/telegram-badge/chat.png)](https://t.me/NextCloudPi) [![forums icon](https://img.shields.io/badge/help-forums-blue.svg)](https://help.nextcloud.com/c/support/appliances-docker-snappy-vm) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=N8PJHSEQF4G7Y&lc=US&item_name=Own%20Your%20Bits&item_number=NextCloudPi&no_note=1&no_shipping=1&currency_code=EUR&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHosted) [![blog](https://img.shields.io/badge/follow-blog-orange.svg)](https://ownyourbits.com)
+# NextcloudPi [![chatroom icon](https://patrolavia.github.io/telegram-badge/chat.png)](https://t.me/NextcloudPi) [![forums icon](https://img.shields.io/badge/help-forums-blue.svg)](https://help.nextcloud.com/c/support/appliances-docker-snappy-vm) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=N8PJHSEQF4G7Y&lc=US&item_name=Own%20Your%20Bits&item_number=NextcloudPi&no_note=1&no_shipping=1&currency_code=EUR&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHosted) [![blog](https://img.shields.io/badge/follow-blog-orange.svg)](https://ownyourbits.com)
 
 
 ![NC Logo](https://ownyourbits.com/wp-content/uploads/2017/11/ncp-square.png)
 
-歡迎來到 [NextCloudPi](https://nextcloudpi.com)！
+歡迎來到 [NextcloudPi](https://nextcloudpi.com)！
 
-NextCloudPi 是專門為 Raspberry Pi、Odroid HC1、rock64 以及其它單板電腦所製作的映象檔。
+NextcloudPi 是專門為 Raspberry Pi、Odroid HC1、rock64 以及其它單板電腦所製作的映象檔。
 
-為了方便使用者簡單地安裝 NextCloud 所製作。
+為了方便使用者簡單地安裝 Nextcloud 所製作。
 
 這個映像檔還為 [ARM](https://hub.docker.com/r/ownyourbits/nextcloudpi-armhf) 及 [x86](https://hub.docker.com/r/ownyourbits/nextcloudpi-x86) 等平臺製作，並且可安裝於任何為 Debian 作業系統為基底的電腦。
 
@@ -40,7 +40,7 @@ NextCloudPi 是專門為 Raspberry Pi、Odroid HC1、rock64 以及其它單板
 ## 特別之處
 
  * 首次安裝導覽頁面
- * NextCloudPi 網路 面板
+ * NextcloudPi 網路 面板
  * 可使用 Wi-Fi
  * Ram logs
  * 自動安裝安全更新，且預設如此。
@@ -58,11 +58,11 @@ NextCloudPi 是專門為 Raspberry Pi、Odroid HC1、rock64 以及其它單板
  * SAMBA ready to share your files with Windows/Mac/Linux
  * USB 自動掛載
  * 遠端更新
- * 自動更新 NextCloudPi
+ * 自動更新 NextcloudPi
  * 自動更新 Nextcloud
  * 更新通知
- * NextCloud 備份、復原備份
- * NextCloud 線上安裝
+ * Nextcloud 備份、復原備份
+ * Nextcloud 線上安裝
  * 格式化 USB 裝置成 BTRFS
  * BTRFS 快照
  * 自動建立 BTRFS 快照
@@ -113,7 +113,7 @@ cd nextcloudpi
 ./build-docker.sh arm64
 ```
 
-NextCloudPi 可以安裝在運行最新的 debian 的任何體系結構中
+NextcloudPi 可以安裝在運行最新的 debian 的任何體系結構中
 
 ```
 # curl -sSL https://raw.githubusercontent.com/nextcloud/nextcloudpi/master/install.sh | bash
@@ -137,6 +137,6 @@ https://hub.docker.com/r/ownyourbits/nextcloudpi-arm64
 
 ## 聯絡
 
-你可以加入[Telegram 群組](https://t.me/NextCloudPi)，或者使用[論壇](https://help.nextcloud.com/c/support/appliances-docker-snappy-vm)來找到我們。
+你可以加入[Telegram 群組](https://t.me/NextcloudPi)，或者使用[論壇](https://help.nextcloud.com/c/support/appliances-docker-snappy-vm)來找到我們。
 
 如果你也想為這個專案進行本地化，歡迎加入 Telegram [NCP Wiki Team](https://t.me/NCP_Wiki_Team) 群組，來洽詢更多身為本地化編輯員該做的事。
diff --git a/install.sh b/install.sh
index 31044e2b..5b38a941 100644
--- a/install.sh
+++ b/install.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# NextCloudPi installation script
+# NextcloudPi installation script
 #
 # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 # GPL licensed (see end of file) * Use at your own risk!
@@ -41,7 +41,7 @@ fi
 cd "${CODE_DIR}"
 
 # install NCP
-echo -e "\nInstalling NextCloudPi..."
+echo -e "\nInstalling NextcloudPi..."
 source etc/library.sh
 
 # check distro
diff --git a/ncp-activation/CSS.css b/ncp-activation/CSS.css
index 2cb5638e..0cc4f6bf 100644
--- a/ncp-activation/CSS.css
+++ b/ncp-activation/CSS.css
@@ -1,5 +1,5 @@
-/* 
- * NextCloudPi Web Panel style sheets. Based on official Nextcloud 12 datasheets
+/*
+ * NextcloudPi Web Panel style sheets. Based on official Nextcloud 12 datasheets
  *
  * Copyleft 2018 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
  * GPL licensed (see end of file) * Use at your own risk!
diff --git a/ncp-activation/JS.js b/ncp-activation/JS.js
index 3432dbe1..f782f977 100644
--- a/ncp-activation/JS.js
+++ b/ncp-activation/JS.js
@@ -1,5 +1,5 @@
 ///
-// NextCloudPi Web Panel javascript library
+// NextcloudPi Web Panel javascript library
 //
 // Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 // GPL licensed (see end of file) * Use at your own risk!
@@ -52,7 +52,7 @@ function nc_admin_ok_cb( result )
   if ( ret.ret == '0' ) {
     launch_nc_passwd();
   } else {
-    $('#error-box').fill( "NextCloudPi not yet initialized, trying again in a few seconds ..." ); 
+    $('#error-box').fill( "NextcloudPi not yet initialized, trying again in a few seconds ..." ); 
     setTimeout( launch_activation, 10000 );
   }
 }
@@ -96,7 +96,7 @@ $(function()
       input.selectionStart = input.selectionEnd;
     } );
 
-  // activate NextCloudPi
+  // activate NextcloudPi
   $( '#activate-ncp' ).on( 'click', function(e)
   {
     $( '#activate-ncp' ).hide();
diff --git a/ncp-activation/index.php b/ncp-activation/index.php
index 8b2d901c..72cfa717 100644
--- a/ncp-activation/index.php
+++ b/ncp-activation/index.php
@@ -4,7 +4,7 @@
 <head>
   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
   <meta charset="utf-8">
-  <title> NextCloudPi Activation </title>
+  <title> NextcloudPi Activation </title>
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="referrer" content="never">
   <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0">
@@ -29,15 +29,15 @@
     $nc_pwd  = rtrim( base64_encode( random_bytes(32) ) , '=' ); // remove last '='. Remove rtrim in the future
     $ncp_pwd = rtrim( base64_encode( random_bytes(32) ) , '=' ); // remove last '='. Remove rtrim in the future
     echo <<<HTML
-          <h1>NextCloudPi Activation</h1>
-          <p>Your NextCloudPi user     is </p><input readonly              type="text" size=32 value="ncp">
-          <p>Your NextCloudPi password is </p><input readonly id="ncp-pwd" type="text" size=32 value="{$ncp_pwd}">&nbsp;&nbsp;<img id="cp-ncp" src="../img/clippy.svg"><span id="cp-ncp-ok"></span>
-          <p>Save this password in order to access to the NextCloudPi web interface at https://nextcloudpi.local:4443</p>
+          <h1>NextcloudPi Activation</h1>
+          <p>Your NextcloudPi user     is </p><input readonly              type="text" size=32 value="ncp">
+          <p>Your NextcloudPi password is </p><input readonly id="ncp-pwd" type="text" size=32 value="{$ncp_pwd}">&nbsp;&nbsp;<img id="cp-ncp" src="../img/clippy.svg"><span id="cp-ncp-ok"></span>
+          <p>Save this password in order to access to the NextcloudPi web interface at https://nextcloudpi.local:4443</p>
           <p>This password can be changed using 'nc-passwd'</p>
 <hr>
-          <p>Your NextCloud     user     is </p><input readonly              type="text" size=32 value="ncp">
+          <p>Your Nextcloud     user     is </p><input readonly              type="text" size=32 value="ncp">
           <p>Your Nextcloud     password is </p><input readonly id="nc-pwd"  type="text" size=32 value="{$nc_pwd}">&nbsp;&nbsp;<img id="cp-nc" src="../img/clippy.svg"><span id="cp-nc-ok"></span>
-          <p>Save this password in order to access NextCloud https://nextcloudpi.local</p>
+          <p>Save this password in order to access Nextcloud https://nextcloudpi.local</p>
           <p>This password can be changed from the Nextcloud user configuration</p>
 <br>
           <p>
@@ -55,7 +55,7 @@ HTML;
   </div>
   <footer role="contentinfo">
   <p class="info">
-  <a href="https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/" target="_blank" rel="noreferrer noopener">NextCloudPi</a> – Keep your data close</p>
+  <a href="https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/" target="_blank" rel="noreferrer noopener">NextcloudPi</a> – Keep your data close</p>
   </footer>
   <?php
     include('../csrf.php');
diff --git a/ncp-app/appinfo/info.xml b/ncp-app/appinfo/info.xml
index 40f8cc51..916f4192 100644
--- a/ncp-app/appinfo/info.xml
+++ b/ncp-app/appinfo/info.xml
@@ -2,13 +2,13 @@
 <info xmlns:xsi= "http://www.w3.org/2001/XMLSchema-instance"
       xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
     <id>nextcloudpi</id>
-    <name>NextCloudPi</name>
+    <name>NextcloudPi</name>
     <summary>Nextcloud management tools</summary>
-    <description><![CDATA[NextCloudPi features a preconfigured Nextcloud instance and a complete set of tools around it for easy management.]]></description>
+    <description><![CDATA[NextcloudPi features a preconfigured Nextcloud instance and a complete set of tools around it for easy management.]]></description>
     <version>0.0.1</version>
     <licence>agpl</licence>
     <author mail="nachoparker@ownyourbits.com" homepage="https://ownyourbits.com">nachoparker</author>
-    <namespace>NextCloudPi</namespace>
+    <namespace>NextcloudPi</namespace>
     <category>tools</category>
     <bugs>https://github.com/nextcloud/nextcloudpi/issues</bugs>
     <dependencies>
@@ -16,7 +16,7 @@
     </dependencies>
     <navigations>
         <navigation>
-            <name>NextCloudPi</name>
+            <name>NextcloudPi</name>
             <route>nextcloudpi.page.index</route>
         </navigation>
     </navigations>
diff --git a/ncp-app/appinfo/routes.php b/ncp-app/appinfo/routes.php
index 13079dd2..c9dcaac6 100644
--- a/ncp-app/appinfo/routes.php
+++ b/ncp-app/appinfo/routes.php
@@ -2,7 +2,7 @@
 /**
  * Create your routes in here. The name is the lowercase name of the controller
  * without the controller part, the stuff after the hash is the method.
- * e.g. page#index -> OCA\NextCloudPi\Controller\PageController->index()
+ * e.g. page#index -> OCA\NextcloudPi\Controller\PageController->index()
  *
  * The controller class has to be registered in the application.php file since
  * it's instantiated in there
diff --git a/ncp-app/lib/Controller/PageController.php b/ncp-app/lib/Controller/PageController.php
index 08822631..ce1f1194 100644
--- a/ncp-app/lib/Controller/PageController.php
+++ b/ncp-app/lib/Controller/PageController.php
@@ -1,5 +1,5 @@
 <?php
-namespace OCA\NextCloudPi\Controller;
+namespace OCA\NextcloudPi\Controller;
 
 use OCP\IRequest;
 use OCP\AppFramework\Http\TemplateResponse;
diff --git a/ncp-app/templates/index.php b/ncp-app/templates/index.php
index fb7d6d92..f53eebce 100644
--- a/ncp-app/templates/index.php
+++ b/ncp-app/templates/index.php
@@ -6,6 +6,6 @@ style('nextcloudpi', 'style');
 
 <div id="ncp-message-wrapper">
   <div id="ncp-message">
-    Opening NextCloudPi Web Panel ...
+    Opening NextcloudPi Web Panel ...
   </div>
 </div>
diff --git a/ncp-web/activate/CSS.css b/ncp-web/activate/CSS.css
index 2cb5638e..0cc4f6bf 100644
--- a/ncp-web/activate/CSS.css
+++ b/ncp-web/activate/CSS.css
@@ -1,5 +1,5 @@
-/* 
- * NextCloudPi Web Panel style sheets. Based on official Nextcloud 12 datasheets
+/*
+ * NextcloudPi Web Panel style sheets. Based on official Nextcloud 12 datasheets
  *
  * Copyleft 2018 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
  * GPL licensed (see end of file) * Use at your own risk!
diff --git a/ncp-web/activate/JS.js b/ncp-web/activate/JS.js
index 3432dbe1..f782f977 100644
--- a/ncp-web/activate/JS.js
+++ b/ncp-web/activate/JS.js
@@ -1,5 +1,5 @@
 ///
-// NextCloudPi Web Panel javascript library
+// NextcloudPi Web Panel javascript library
 //
 // Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 // GPL licensed (see end of file) * Use at your own risk!
@@ -52,7 +52,7 @@ function nc_admin_ok_cb( result )
   if ( ret.ret == '0' ) {
     launch_nc_passwd();
   } else {
-    $('#error-box').fill( "NextCloudPi not yet initialized, trying again in a few seconds ..." ); 
+    $('#error-box').fill( "NextcloudPi not yet initialized, trying again in a few seconds ..." ); 
     setTimeout( launch_activation, 10000 );
   }
 }
@@ -96,7 +96,7 @@ $(function()
       input.selectionStart = input.selectionEnd;
     } );
 
-  // activate NextCloudPi
+  // activate NextcloudPi
   $( '#activate-ncp' ).on( 'click', function(e)
   {
     $( '#activate-ncp' ).hide();
diff --git a/ncp-web/activate/index.php b/ncp-web/activate/index.php
index b983b8d7..4adaba9b 100644
--- a/ncp-web/activate/index.php
+++ b/ncp-web/activate/index.php
@@ -26,7 +26,7 @@
 <head>
   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
   <meta charset="utf-8">
-  <title> NextCloudPi Activation </title>
+  <title> NextcloudPi Activation </title>
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="referrer" content="never">
   <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0">
@@ -51,15 +51,15 @@
     $nc_pwd  = rtrim( base64_encode( random_bytes(32) ) , '=' ); // remove last '='. Remove rtrim in the future
     $ncp_pwd = rtrim( base64_encode( random_bytes(32) ) , '=' ); // remove last '='. Remove rtrim in the future
     echo <<<HTML
-          <h1>NextCloudPi Activation</h1>
-          <p>Your NextCloudPi user     is </p><input readonly              type="text" size=32 value="ncp">
-          <p>Your NextCloudPi password is </p><input readonly id="ncp-pwd" type="text" size=32 value="{$ncp_pwd}">&nbsp;&nbsp;<img id="cp-ncp" src="../img/clippy.svg"><span id="cp-ncp-ok"></span>
-          <p>Save this password in order to access to the NextCloudPi web interface at https://nextcloudpi.local:4443</p>
+          <h1>NextcloudPi Activation</h1>
+          <p>Your NextcloudPi user     is </p><input readonly              type="text" size=32 value="ncp">
+          <p>Your NextcloudPi password is </p><input readonly id="ncp-pwd" type="text" size=32 value="{$ncp_pwd}">&nbsp;&nbsp;<img id="cp-ncp" src="../img/clippy.svg"><span id="cp-ncp-ok"></span>
+          <p>Save this password in order to access to the NextcloudPi web interface at https://nextcloudpi.local:4443</p>
           <p>This password can be changed using 'nc-passwd'</p>
 <hr>
-          <p>Your NextCloud     user     is </p><input readonly              type="text" size=32 value="ncp">
+          <p>Your Nextcloud     user     is </p><input readonly              type="text" size=32 value="ncp">
           <p>Your Nextcloud     password is </p><input readonly id="nc-pwd"  type="text" size=32 value="{$nc_pwd}">&nbsp;&nbsp;<img id="cp-nc" src="../img/clippy.svg"><span id="cp-nc-ok"></span>
-          <p>Save this password in order to access NextCloud https://nextcloudpi.local</p>
+          <p>Save this password in order to access Nextcloud https://nextcloudpi.local</p>
           <p>This password can be changed from the Nextcloud user configuration</p>
 <br>
           <p>
@@ -77,7 +77,7 @@ HTML;
   </div>
   <footer role="contentinfo">
   <p class="info">
-  <a href="https://nextcloudpi.com" target="_blank" rel="noreferrer noopener">NextCloudPi</a> – Keep your data close</p>
+  <a href="https://nextcloudpi.com" target="_blank" rel="noreferrer noopener">NextcloudPi</a> – Keep your data close</p>
   </footer>
   <?php
     include('../csrf.php');
diff --git a/ncp-web/backups.php b/ncp-web/backups.php
index 87c1b6c1..28f0c2f2 100644
--- a/ncp-web/backups.php
+++ b/ncp-web/backups.php
@@ -1,5 +1,5 @@
 <!--
- NextCloudPi Web Backups Panel
+ NextcloudPi Web Backups Panel
 
  Copyleft 2019 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
  GPL licensed (see end of file) * Use at your own risk!
diff --git a/ncp-web/csrf.php b/ncp-web/csrf.php
index 34d0fc03..68574599 100644
--- a/ncp-web/csrf.php
+++ b/ncp-web/csrf.php
@@ -1,6 +1,6 @@
 <?php
 ///
-// NextCloudPi Web Panel CSRF protection library
+// NextcloudPi Web Panel CSRF protection library
 //
 // Inspired by http://blog.ircmaxell.com/2013/02/preventing-csrf-attacks.html
 //
diff --git a/ncp-web/css/ncp.css b/ncp-web/css/ncp.css
index fec345df..e2110f82 100644
--- a/ncp-web/css/ncp.css
+++ b/ncp-web/css/ncp.css
@@ -1,5 +1,5 @@
-/* 
- * NextCloudPi Web Panel style sheets. Based on official Nextcloud 12 datasheets
+/*
+ * NextcloudPi Web Panel style sheets. Based on official Nextcloud 12 datasheets
  *
  * Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
  * GPL licensed (see end of file) * Use at your own risk!
diff --git a/ncp-web/decrypt/CSS.css b/ncp-web/decrypt/CSS.css
index a687c9be..b68983e1 100644
--- a/ncp-web/decrypt/CSS.css
+++ b/ncp-web/decrypt/CSS.css
@@ -1,5 +1,5 @@
-/* 
- * NextCloudPi Web Panel style sheets. Based on official Nextcloud 12 datasheets
+/*
+ * NextcloudPi Web Panel style sheets. Based on official Nextcloud 12 datasheets
  *
  * Copyleft 2018 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
  * GPL licensed (see end of file) * Use at your own risk!
diff --git a/ncp-web/decrypt/JS.js b/ncp-web/decrypt/JS.js
index 91d6149c..f9af3666 100644
--- a/ncp-web/decrypt/JS.js
+++ b/ncp-web/decrypt/JS.js
@@ -1,5 +1,5 @@
 ///
-// NextCloudPi Web Panel javascript library
+// NextcloudPi Web Panel javascript library
 //
 // Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 // GPL licensed (see end of file) * Use at your own risk!
diff --git a/ncp-web/decrypt/index.php b/ncp-web/decrypt/index.php
index 795b1287..6ee62417 100644
--- a/ncp-web/decrypt/index.php
+++ b/ncp-web/decrypt/index.php
@@ -26,7 +26,7 @@
 <head>
   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
   <meta charset="utf-8">
-  <title> Unlock NextCloudPi </title>
+  <title> Unlock NextcloudPi </title>
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="referrer" content="never">
   <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0">
@@ -49,7 +49,7 @@
           <img id="ncp-logo" src="../img/ncp-logo.svg">
 <?php
     echo <<<HTML
-          <h1>NextCloudPi</h1>
+          <h1>NextcloudPi</h1>
           <p>Encrypted instance</p>
 
           <div id="decrypt-config-box" class="content-box table-wrapper">
@@ -80,7 +80,7 @@ HTML;
   </div>
   <footer role="contentinfo">
   <p class="info">
-  <a href="https://nextcloudpi.com" target="_blank" rel="noreferrer noopener">NextCloudPi</a> – Keep your data close</p>
+  <a href="https://nextcloudpi.com" target="_blank" rel="noreferrer noopener">NextcloudPi</a> – Keep your data close</p>
   </footer>
   <?php
     include('../csrf.php');
diff --git a/ncp-web/download.php b/ncp-web/download.php
index 7d694a27..7444d118 100644
--- a/ncp-web/download.php
+++ b/ncp-web/download.php
@@ -1,6 +1,6 @@
 <?php
 ///
-// NextCloudPi Web Panel backend
+// NextcloudPi Web Panel backend
 //
 // Copyleft 2019 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 // GPL licensed (see end of file) * Use at your own risk!
diff --git a/ncp-web/download_logs.php b/ncp-web/download_logs.php
index 15413445..d3c0ffc6 100644
--- a/ncp-web/download_logs.php
+++ b/ncp-web/download_logs.php
@@ -1,6 +1,6 @@
 <?php
 ///
-// NextCloudPi Web Panel backend
+// NextcloudPi Web Panel backend
 //
 // Copyleft 2019 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 // GPL licensed (see end of file) * Use at your own risk!
diff --git a/ncp-web/elements.php b/ncp-web/elements.php
index 7c307a3c..c1619e99 100644
--- a/ncp-web/elements.php
+++ b/ncp-web/elements.php
@@ -1,6 +1,6 @@
 <?php
 ///
-// NextCloudPi Web Panel Side bar
+// NextcloudPi Web Panel Side bar
 //
 // Copyleft 2018 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 // GPL licensed (see end of file) * Use at your own risk!
diff --git a/ncp-web/index.php b/ncp-web/index.php
index 17045474..6f2001b6 100644
--- a/ncp-web/index.php
+++ b/ncp-web/index.php
@@ -1,6 +1,6 @@
 <?php
 /*
- NextCloudPi Web Panel frontend
+ NextcloudPi Web Panel frontend
 
  Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
  GPL licensed (see end of file) * Use at your own risk!
@@ -53,7 +53,7 @@ header("Link: </js/minified.js>; rel=preload; as=script;,</js/ncp.js>; rel=prelo
 <html class="ng-csp" data-placeholder-focus="false" lang="en">
 <head>
     <meta charset="utf-8">
-    <title>NextCloudPi Panel</title>
+    <title>NextcloudPi Panel</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <meta name="referrer" content="never">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0">
@@ -102,7 +102,7 @@ header("Link: </js/minified.js>; rel=preload; as=script;,</js/ncp.js>; rel=prelo
     <div id="first-run-wizard">
       <div class='dialog'>
         <br><br>
-        <h2 id="config-box-title">NextCloudPi First Run</h2>
+        <h2 id="config-box-title">NextcloudPi First Run</h2>
         <p>Click to start the configuration wizard</p>
         <br>
         <a href="wizard"><img class="wizard-btn" src="wizard/img/ncp-logo.svg" class="wizard"></a>
@@ -136,7 +136,7 @@ HTML;
     <div id="header-left">
       <a href="https://nextcloudpi.com" id="nextcloudpi" target="_blank" tabindex="1">
         <div class="logo-icon">
-           <h1 class="hidden-visually">NextCloudPi</h1>
+           <h1 class="hidden-visually">NextcloudPi</h1>
         </div>
       </a>
       <a id=versionlink target="_blank" href="https://github.com/nextcloud/nextcloudpi/blob/master/changelog.md">
@@ -200,14 +200,14 @@ HTML;
               <div class="icon-logs"></div>
           </div>
       </div>
-      <a href="wizard" title="<?php echo $l->__("NextCloudPi Wizard"); ?>">
+      <a href="wizard" title="<?php echo $l->__("NextcloudPi Wizard"); ?>">
         <div class="wizard-btn">
           <div class="expand">
             <div class="icon-wizard-white"></div>
           </div>
         </div>
       </a>
-      <a href="https://docs.nextcloudpi.com/" target="_blank" tabindex="1"  title="<?php echo $l->__("NextCloudPi Wiki"); ?>">
+      <a href="https://docs.nextcloudpi.com/" target="_blank" tabindex="1"  title="<?php echo $l->__("NextcloudPi Wiki"); ?>">
         <div id="nc-button">
             <div class="expand">
                 <div class="icon-nc-info"></div>
@@ -285,7 +285,7 @@ HTML
           </div>
         </div>
         <div id="logs-wrapper" class="content-box <?php if(!array_key_exists('app',$_GET) || (array_key_exists('app',$_GET) && $_GET['app'] != 'logs')) echo 'hidden';?>">
-          <h2 class="text-title"><?php echo $l->__("NextCloudPi logs"); ?></h2>
+          <h2 class="text-title"><?php echo $l->__("NextcloudPi logs"); ?></h2>
           <div id="logs-content" class="table-wrapper">
             <div id="logs-details-box" class="outputbox"><?php echo str_replace(array("\r\n", "\n", "\r"), '<br/>', file_get_contents('/var/log/ncp.log')) ?></div>
             <div id="log-download-btn-wrapper"><input id="log-download-btn" type="button" value="Download"/></div>
diff --git a/ncp-web/js/ncp.js b/ncp-web/js/ncp.js
index f2f8e43a..aa82cdf3 100644
--- a/ncp-web/js/ncp.js
+++ b/ncp-web/js/ncp.js
@@ -1,5 +1,5 @@
 ///
-// NextCloudPi Web Panel javascript library
+// NextcloudPi Web Panel javascript library
 //
 // Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 // GPL licensed (see end of file) * Use at your own risk!
diff --git a/ncp-web/l10n/de.json b/ncp-web/l10n/de.json
index 59684a9e..bea1d4fb 100644
--- a/ncp-web/l10n/de.json
+++ b/ncp-web/l10n/de.json
@@ -5,5 +5,5 @@
   "run": "Ausführen",
   "skip": "&Uuml;berspringen",
   "close": "Schlie&szlig;en",
-  "Configure NextCloudPi features": "NextCloudPi Funktionen konfigurieren"
+  "Configure NextcloudPi features": "NextcloudPi Funktionen konfigurieren"
 }}
diff --git a/ncp-web/l10n/es.json b/ncp-web/l10n/es.json
index 25ed9ea0..9e6d90b0 100644
--- a/ncp-web/l10n/es.json
+++ b/ncp-web/l10n/es.json
@@ -1,6 +1,6 @@
 {
     "translations": {
-        "Configure NextCloudPi features": "Configurar NextCloudPi",
+        "Configure NextcloudPi features": "Configurar NextcloudPi",
         "Run": "Ejecutar",
         "This application requires JavaScript for correct operation. Please %s enable JavaScript %s and reload the page.": "Esta aplicación requiere Javascript para un funcionamiento correcto. Por favor %s active Javascript %s y recarge la página."
     }
diff --git a/ncp-web/ncp-launcher.php b/ncp-web/ncp-launcher.php
index eff9048c..da242a33 100644
--- a/ncp-web/ncp-launcher.php
+++ b/ncp-web/ncp-launcher.php
@@ -1,6 +1,6 @@
 <?php 
 ///
-// NextCloudPi Web Panel backend
+// NextcloudPi Web Panel backend
 //
 // Copyleft 2018 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 // GPL licensed (see end of file) * Use at your own risk!
diff --git a/ncp-web/upload.php b/ncp-web/upload.php
index 1dc6a788..57662dd6 100644
--- a/ncp-web/upload.php
+++ b/ncp-web/upload.php
@@ -1,6 +1,6 @@
 <?php
 ///
-// NextCloudPi Web Panel backend
+// NextcloudPi Web Panel backend
 //
 // Copyleft 2019 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 // GPL licensed (see end of file) * Use at your own risk!
diff --git a/run_update_history.sh b/run_update_history.sh
index 4faa5c2f..5b11151a 100755
--- a/run_update_history.sh
+++ b/run_update_history.sh
@@ -55,7 +55,7 @@ if is_more_recent_than "$latest_checkpoint_version" "$current_version" ; then
 
     mid_version=$( basename ${updates_list[$mid]} .sh )
 
-    if is_more_recent_than "$mid_version" "$current_version" ; then 
+    if is_more_recent_than "$mid_version" "$current_version" ; then
       # Mid's version update is applicable to the current version
       # Check if the previous checkpoint (mid-1) is applicable
 
@@ -108,7 +108,7 @@ if is_more_recent_than "$latest_checkpoint_version" "$current_version" ; then
       exit 1
     }
     echo "v$tag_update" > /usr/local/etc/ncp-version
-    [[ $i != $end_of_list ]] && echo -e "NextCloudPi updated to version v$tag_update" || true
+    [[ $i != $end_of_list ]] && echo -e "NextcloudPi updated to version v$tag_update" || true
   done
 fi
 
diff --git a/tests/activation_tests.py b/tests/activation_tests.py
index 7e871e59..b606be38 100755
--- a/tests/activation_tests.py
+++ b/tests/activation_tests.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 """
-Automatic testing for NextCloudPi
+Automatic testing for NextcloudPi
 
 Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 GPL licensed (see LICENSE file in repository root).
@@ -99,7 +99,7 @@ def test_activation(IP, nc_port, admin_port, options, wait_timeout=120):
     driver.implicitly_wait(5)
     test.new("activation opens")
     driver.get(f"https://{IP}:{nc_port}")
-    test.check("NextCloudPi Activation" in driver.title)
+    test.check("NextcloudPi Activation" in driver.title)
     try:
         ncp_pass = driver.find_element(By.ID, "ncp-pwd").get_attribute("value")
         nc_pass = driver.find_element(By.ID, "nc-pwd").get_attribute("value")
@@ -146,7 +146,7 @@ def test_activation(IP, nc_port, admin_port, options, wait_timeout=120):
     except Exception as e:
         print(f"WARN: Exception while attempting to get ncp-web: '{e}'")
         raise e
-    test.check("NextCloudPi Panel" in driver.title)
+    test.check("NextcloudPi Panel" in driver.title)
     test.report("first run wizard", is_element_present(driver, By.ID, "first-run-wizard"))
 
     driver.close()
diff --git a/tests/nextcloud_tests.py b/tests/nextcloud_tests.py
index 6005595d..2bc5362c 100755
--- a/tests/nextcloud_tests.py
+++ b/tests/nextcloud_tests.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 """
-Automatic testing for NextCloudPi
+Automatic testing for NextcloudPi
 
 Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 GPL licensed (see LICENSE file in repository root).
@@ -124,7 +124,7 @@ def test_nextcloud(IP: str, nc_port: str, driver: WebDriver):
         driver.get(f"https://{IP}:{nc_port}/index.php/settings/admin/overview")
     except Exception as e:
         test.check(e, msg=f"{tc.red}error:{tc.normal} unable to reach {tc.yellow + IP + tc.normal}")
-    test.check("NextCloudPi" in driver.title, msg="NextCloudPi not found in page title!")
+    test.check("NextcloudPi" in driver.title, msg="NextcloudPi not found in page title!")
     trusted_domain_str = "You are accessing the server from an untrusted domain"
     test.report("trusted domain", trusted_domain_str not in driver.page_source, f"Domain '{IP}' is not trusted")
     try:
diff --git a/tests/system_tests.py b/tests/system_tests.py
index dacbb18e..7398bfb3 100755
--- a/tests/system_tests.py
+++ b/tests/system_tests.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 """
-Automatic system testing for NextCloudPi
+Automatic system testing for NextcloudPi
 
 Copyleft 2018 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 GPL licensed (see LICENSE file in repository root).
@@ -275,7 +275,7 @@ if __name__ == "__main__":
 
     print(pre_cmd)
     # checks
-    print("\nNextCloudPi system checks")
+    print("\nNextcloudPi system checks")
     print("-------------------------")
     running_result = check_processes_running(processes_must_be_running)
     install_result = check_binaries_installed(binaries_must_be_installed)
diff --git a/update.sh b/update.sh
index ee514d97..fd26239d 100755
--- a/update.sh
+++ b/update.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Updater for NextCloudPi
+# Updater for NextcloudPi
 #
 # Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
 # GPL licensed (see end of file) * Use at your own risk!