renamed to NextCloudPlusv0.53.29

126 files changed, 66 insertions, 68 deletions

diff --git a/etc/library.sh b/etc/library.sh
index a08d6fd4..56ad6b71 100644
--- a/etc/library.sh
+++ b/etc/library.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# NextCloudPi function library
+# NextCloudPlus 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!
@@ -13,7 +13,7 @@
 function config()
 {
   local INSTALL_SCRIPT="$1"
-  local BACKTITLE="NextCloudPi installer configuration"
+  local BACKTITLE="NextCloudPlus installer configuration"
 
   type dialog &>/dev/null || { echo "please, install dialog for interactive configuration"; return 1; }
 
@@ -133,12 +133,12 @@ function info_script()
 {
   (
     local SCRIPT=$1
-    cd /usr/local/etc/nextcloudpi-config.d/ || return 1
+    cd /usr/local/etc/ncp-config.d/ || return 1
     unset show_info INFO INFOTITLE
     source ./"$SCRIPT"
     local INFOTITLE="${INFOTITLE:-Info}"
     [[ "$INFO" == "" ]] && return 0
-    whiptail --yesno --backtitle "NextCloudPi configuration" --title "$INFOTITLE" "$INFO" 20 90
+    whiptail --yesno --backtitle "NextCloudPlus configuration" --title "$INFOTITLE" "$INFO" 20 90
   )
 }
 
@@ -146,7 +146,7 @@ function configure_script()
 {
   (
     local SCRIPT=$1
-    cd /usr/local/etc/nextcloudpi-config.d/ || return 1
+    cd /usr/local/etc/ncp-config.d/ || return 1
     config "$SCRIPT" || return 1                 # writes "$INSTALLATION_CODE"
     echo -e "$INSTALLATION_CODE" > "$SCRIPT"     # save configuration
     source ./"$SCRIPT"                           # load configuration
@@ -162,7 +162,7 @@ function cleanup_script()
 {
   (
     local SCRIPT=$1
-    cd /usr/local/etc/nextcloudpi-config.d/ || return 1
+    cd /usr/local/etc/ncp-config.d/ || return 1
     unset cleanup
     source ./"$SCRIPT"
     if [[ $( type -t cleanup ) == function ]]; then
diff --git a/etc/nextcloudpi-config.d/NFS.sh b/etc/ncp-config.d/NFS.sh
index 81acf758..e3b64988 100644
--- a/etc/nextcloudpi-config.d/NFS.sh
+++ b/etc/ncp-config.d/NFS.sh
@@ -24,8 +24,7 @@ INFOTITLE="Instructions for external synchronization"
 INFO="If we intend to modify the data folder through NFS,
 then we have to synchronize NextCloud to make it aware of the changes.
 
-This can be done manually or automatically using 'nc-scan' and 'nc-scan-auto' 
-from 'nextcloudpi-config'" 
+This can be done manually or automatically using 'nc-scan' and 'nc-scan-auto'"
 
 install()
 {
diff --git a/etc/nextcloudpi-config.d/SSH.sh b/etc/ncp-config.d/SSH.sh
index 2dcdc7d2..2dcdc7d2 100644
--- a/etc/nextcloudpi-config.d/SSH.sh
+++ b/etc/ncp-config.d/SSH.sh
diff --git a/etc/nextcloudpi-config.d/UFW.sh b/etc/ncp-config.d/UFW.sh
index 617e6ed7..617e6ed7 100644
--- a/etc/nextcloudpi-config.d/UFW.sh
+++ b/etc/ncp-config.d/UFW.sh
diff --git a/etc/nextcloudpi-config.d/dnsmasq.sh b/etc/ncp-config.d/dnsmasq.sh
index d022def5..d022def5 100644
--- a/etc/nextcloudpi-config.d/dnsmasq.sh
+++ b/etc/ncp-config.d/dnsmasq.sh
diff --git a/etc/nextcloudpi-config.d/duckDNS.sh b/etc/ncp-config.d/duckDNS.sh
index 4db8772e..90d9c35f 100644
--- a/etc/nextcloudpi-config.d/duckDNS.sh
+++ b/etc/ncp-config.d/duckDNS.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# DuckDNS installation on Raspbian for NextcloudPi
+# DuckDNS installation on Raspbian for NextcloudPlus
 #
 #
 # Copyleft 2017 by Courtney Hicks
diff --git a/etc/nextcloudpi-config.d/fail2ban.sh b/etc/ncp-config.d/fail2ban.sh
index ddb8511d..99f89760 100644
--- a/etc/nextcloudpi-config.d/fail2ban.sh
+++ b/etc/ncp-config.d/fail2ban.sh
@@ -62,7 +62,7 @@ EOF
 
   # 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|NextCloudPlus|' /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/etc/nextcloudpi-config.d/freeDNS.sh b/etc/ncp-config.d/freeDNS.sh
index bffc98e1..bffc98e1 100644
--- a/etc/nextcloudpi-config.d/freeDNS.sh
+++ b/etc/ncp-config.d/freeDNS.sh
diff --git a/etc/nextcloudpi-config.d/l10n/NFS/es.json b/etc/ncp-config.d/l10n/NFS/es.json
index 9e413dec..9e413dec 100644
--- a/etc/nextcloudpi-config.d/l10n/NFS/es.json
+++ b/etc/ncp-config.d/l10n/NFS/es.json
diff --git a/etc/nextcloudpi-config.d/l10n/SSH/es.json b/etc/ncp-config.d/l10n/SSH/es.json
index 408891f5..408891f5 100644
--- a/etc/nextcloudpi-config.d/l10n/SSH/es.json
+++ b/etc/ncp-config.d/l10n/SSH/es.json
diff --git a/etc/nextcloudpi-config.d/l10n/UFW/es.json b/etc/ncp-config.d/l10n/UFW/es.json
index 241721d7..241721d7 100644
--- a/etc/nextcloudpi-config.d/l10n/UFW/es.json
+++ b/etc/ncp-config.d/l10n/UFW/es.json
diff --git a/etc/nextcloudpi-config.d/l10n/dnsmasq/es.json b/etc/ncp-config.d/l10n/dnsmasq/es.json
index f4f4844f..f4f4844f 100644
--- a/etc/nextcloudpi-config.d/l10n/dnsmasq/es.json
+++ b/etc/ncp-config.d/l10n/dnsmasq/es.json
diff --git a/etc/nextcloudpi-config.d/l10n/duckDNS/es.json b/etc/ncp-config.d/l10n/duckDNS/es.json
index d2495d2d..d2495d2d 100644
--- a/etc/nextcloudpi-config.d/l10n/duckDNS/es.json
+++ b/etc/ncp-config.d/l10n/duckDNS/es.json
diff --git a/etc/nextcloudpi-config.d/l10n/fail2ban/es.json b/etc/ncp-config.d/l10n/fail2ban/es.json
index 61742a85..61742a85 100644
--- a/etc/nextcloudpi-config.d/l10n/fail2ban/es.json
+++ b/etc/ncp-config.d/l10n/fail2ban/es.json
diff --git a/etc/nextcloudpi-config.d/l10n/freeDNS/es.json b/etc/ncp-config.d/l10n/freeDNS/es.json
index 5d2b3f2c..5d2b3f2c 100644
--- a/etc/nextcloudpi-config.d/l10n/freeDNS/es.json
+++ b/etc/ncp-config.d/l10n/freeDNS/es.json
diff --git a/etc/nextcloudpi-config.d/l10n/letsencrypt/es.json b/etc/ncp-config.d/l10n/letsencrypt/es.json
index 2887f785..2887f785 100644
--- a/etc/nextcloudpi-config.d/l10n/letsencrypt/es.json
+++ b/etc/ncp-config.d/l10n/letsencrypt/es.json
diff --git a/etc/nextcloudpi-config.d/l10n/modsecurity/es.json b/etc/ncp-config.d/l10n/modsecurity/es.json
index 408cdbe0..408cdbe0 100644
--- a/etc/nextcloudpi-config.d/l10n/modsecurity/es.json
+++ b/etc/ncp-config.d/l10n/modsecurity/es.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-admin/es.json b/etc/ncp-config.d/l10n/nc-admin/es.json
index 34866b55..34866b55 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-admin/es.json
+++ b/etc/ncp-config.d/l10n/nc-admin/es.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-audit/de.json b/etc/ncp-config.d/l10n/nc-audit/de.json
index 8638ebbc..8638ebbc 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-audit/de.json
+++ b/etc/ncp-config.d/l10n/nc-audit/de.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-automount/de.json b/etc/ncp-config.d/l10n/nc-automount/de.json
index 8052bd35..8052bd35 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-automount/de.json
+++ b/etc/ncp-config.d/l10n/nc-automount/de.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-automount/es.json b/etc/ncp-config.d/l10n/nc-automount/es.json
index 31b15e13..31b15e13 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-automount/es.json
+++ b/etc/ncp-config.d/l10n/nc-automount/es.json
diff --git a/etc/ncp-config.d/l10n/nc-autoupdate-ncp/de.json b/etc/ncp-config.d/l10n/nc-autoupdate-ncp/de.json
new file mode 100644
index 00000000..2bf06f74
--- /dev/null
+++ b/etc/ncp-config.d/l10n/nc-autoupdate-ncp/de.json
@@ -0,0 +1,3 @@
+{"translations": {
+    "nc-autoupdate-ncp": "Automatische NextCloudPlus Updates"
+}}
diff --git a/etc/nextcloudpi-config.d/l10n/nc-autoupdate-ncp/es.json b/etc/ncp-config.d/l10n/nc-autoupdate-ncp/es.json
index f59311aa..f59311aa 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-autoupdate-ncp/es.json
+++ b/etc/ncp-config.d/l10n/nc-autoupdate-ncp/es.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-backup-auto/de.json b/etc/ncp-config.d/l10n/nc-backup-auto/de.json
index ee2d5513..ee2d5513 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-backup-auto/de.json
+++ b/etc/ncp-config.d/l10n/nc-backup-auto/de.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-backup-auto/es.json b/etc/ncp-config.d/l10n/nc-backup-auto/es.json
index f7b7e58f..f7b7e58f 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-backup-auto/es.json
+++ b/etc/ncp-config.d/l10n/nc-backup-auto/es.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-backup/de.json b/etc/ncp-config.d/l10n/nc-backup/de.json
index 401a905e..401a905e 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-backup/de.json
+++ b/etc/ncp-config.d/l10n/nc-backup/de.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-backup/es.json b/etc/ncp-config.d/l10n/nc-backup/es.json
index abb5596f..abb5596f 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-backup/es.json
+++ b/etc/ncp-config.d/l10n/nc-backup/es.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-database/de.json b/etc/ncp-config.d/l10n/nc-database/de.json
index 057e758a..057e758a 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-database/de.json
+++ b/etc/ncp-config.d/l10n/nc-database/de.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-database/es.json b/etc/ncp-config.d/l10n/nc-database/es.json
index c97a0235..c97a0235 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-database/es.json
+++ b/etc/ncp-config.d/l10n/nc-database/es.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-datadir/de.json b/etc/ncp-config.d/l10n/nc-datadir/de.json
index e8e8605f..e8e8605f 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-datadir/de.json
+++ b/etc/ncp-config.d/l10n/nc-datadir/de.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-datadir/es.json b/etc/ncp-config.d/l10n/nc-datadir/es.json
index 19aea39f..19aea39f 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-datadir/es.json
+++ b/etc/ncp-config.d/l10n/nc-datadir/es.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-export-ncp/de.json b/etc/ncp-config.d/l10n/nc-export-ncp/de.json
index 00f29dda..00f29dda 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-export-ncp/de.json
+++ b/etc/ncp-config.d/l10n/nc-export-ncp/de.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-export-ncp/es.json b/etc/ncp-config.d/l10n/nc-export-ncp/es.json
index d05353be..d05353be 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-export-ncp/es.json
+++ b/etc/ncp-config.d/l10n/nc-export-ncp/es.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-fix-permissions/de.json b/etc/ncp-config.d/l10n/nc-fix-permissions/de.json
index ff44194f..ff44194f 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-fix-permissions/de.json
+++ b/etc/ncp-config.d/l10n/nc-fix-permissions/de.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-fix-permissions/es.json b/etc/ncp-config.d/l10n/nc-fix-permissions/es.json
index 9bcd62a2..9bcd62a2 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-fix-permissions/es.json
+++ b/etc/ncp-config.d/l10n/nc-fix-permissions/es.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-format-USB/de.json b/etc/ncp-config.d/l10n/nc-format-USB/de.json
index 055f640b..055f640b 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-format-USB/de.json
+++ b/etc/ncp-config.d/l10n/nc-format-USB/de.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-format-USB/es.json b/etc/ncp-config.d/l10n/nc-format-USB/es.json
index 43c90d71..43c90d71 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-format-USB/es.json
+++ b/etc/ncp-config.d/l10n/nc-format-USB/es.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-forward-ports/de.json b/etc/ncp-config.d/l10n/nc-forward-ports/de.json
index a62d07bd..a62d07bd 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-forward-ports/de.json
+++ b/etc/ncp-config.d/l10n/nc-forward-ports/de.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-forward-ports/es.json b/etc/ncp-config.d/l10n/nc-forward-ports/es.json
index b70387d7..b70387d7 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-forward-ports/es.json
+++ b/etc/ncp-config.d/l10n/nc-forward-ports/es.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-httpsonly/de.json b/etc/ncp-config.d/l10n/nc-httpsonly/de.json
index f82b4830..f82b4830 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-httpsonly/de.json
+++ b/etc/ncp-config.d/l10n/nc-httpsonly/de.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-httpsonly/es.json b/etc/ncp-config.d/l10n/nc-httpsonly/es.json
index ca321088..ca321088 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-httpsonly/es.json
+++ b/etc/ncp-config.d/l10n/nc-httpsonly/es.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-import-ncp/de.json b/etc/ncp-config.d/l10n/nc-import-ncp/de.json
index b9880ed1..b9880ed1 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-import-ncp/de.json
+++ b/etc/ncp-config.d/l10n/nc-import-ncp/de.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-import-ncp/es.json b/etc/ncp-config.d/l10n/nc-import-ncp/es.json
index 5698394f..5698394f 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-import-ncp/es.json
+++ b/etc/ncp-config.d/l10n/nc-import-ncp/es.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-info/de.json b/etc/ncp-config.d/l10n/nc-info/de.json
index 9993d09b..9993d09b 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-info/de.json
+++ b/etc/ncp-config.d/l10n/nc-info/de.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-info/es.json b/etc/ncp-config.d/l10n/nc-info/es.json
index e23233a7..e23233a7 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-info/es.json
+++ b/etc/ncp-config.d/l10n/nc-info/es.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-init/de.json b/etc/ncp-config.d/l10n/nc-init/de.json
index 9bed233c..9bed233c 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-init/de.json
+++ b/etc/ncp-config.d/l10n/nc-init/de.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-init/es.json b/etc/ncp-config.d/l10n/nc-init/es.json
index 0e93e9ff..0e93e9ff 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-init/es.json
+++ b/etc/ncp-config.d/l10n/nc-init/es.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-limits/de.json b/etc/ncp-config.d/l10n/nc-limits/de.json
index 705aefe4..705aefe4 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-limits/de.json
+++ b/etc/ncp-config.d/l10n/nc-limits/de.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-limits/es.json b/etc/ncp-config.d/l10n/nc-limits/es.json
index 554e07e8..554e07e8 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-limits/es.json
+++ b/etc/ncp-config.d/l10n/nc-limits/es.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-nextcloud/de.json b/etc/ncp-config.d/l10n/nc-nextcloud/de.json
index 1ececb2b..1ececb2b 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-nextcloud/de.json
+++ b/etc/ncp-config.d/l10n/nc-nextcloud/de.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-nextcloud/es.json b/etc/ncp-config.d/l10n/nc-nextcloud/es.json
index c13bfd7f..c13bfd7f 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-nextcloud/es.json
+++ b/etc/ncp-config.d/l10n/nc-nextcloud/es.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-notify-updates/de.json b/etc/ncp-config.d/l10n/nc-notify-updates/de.json
index 21660a30..21660a30 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-notify-updates/de.json
+++ b/etc/ncp-config.d/l10n/nc-notify-updates/de.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-notify-updates/es.json b/etc/ncp-config.d/l10n/nc-notify-updates/es.json
index 3f8bfb4a..3f8bfb4a 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-notify-updates/es.json
+++ b/etc/ncp-config.d/l10n/nc-notify-updates/es.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-passwd/de.json b/etc/ncp-config.d/l10n/nc-passwd/de.json
index ef69f438..ef69f438 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-passwd/de.json
+++ b/etc/ncp-config.d/l10n/nc-passwd/de.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-passwd/es.json b/etc/ncp-config.d/l10n/nc-passwd/es.json
index ba86eb1a..ba86eb1a 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-passwd/es.json
+++ b/etc/ncp-config.d/l10n/nc-passwd/es.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-ramlogs/de.json b/etc/ncp-config.d/l10n/nc-ramlogs/de.json
index bc1cb5c3..bc1cb5c3 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-ramlogs/de.json
+++ b/etc/ncp-config.d/l10n/nc-ramlogs/de.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-ramlogs/es.json b/etc/ncp-config.d/l10n/nc-ramlogs/es.json
index 4791b091..4791b091 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-ramlogs/es.json
+++ b/etc/ncp-config.d/l10n/nc-ramlogs/es.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-restore/de.json b/etc/ncp-config.d/l10n/nc-restore/de.json
index 69d4b619..69d4b619 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-restore/de.json
+++ b/etc/ncp-config.d/l10n/nc-restore/de.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-restore/es.json b/etc/ncp-config.d/l10n/nc-restore/es.json
index 977aec85..977aec85 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-restore/es.json
+++ b/etc/ncp-config.d/l10n/nc-restore/es.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-rsync-auto/es.json b/etc/ncp-config.d/l10n/nc-rsync-auto/es.json
index 5b9affd8..5b9affd8 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-rsync-auto/es.json
+++ b/etc/ncp-config.d/l10n/nc-rsync-auto/es.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-rsync/es.json b/etc/ncp-config.d/l10n/nc-rsync/es.json
index 884c0bc5..884c0bc5 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-rsync/es.json
+++ b/etc/ncp-config.d/l10n/nc-rsync/es.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-scan-auto/de.json b/etc/ncp-config.d/l10n/nc-scan-auto/de.json
index cf168150..cf168150 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-scan-auto/de.json
+++ b/etc/ncp-config.d/l10n/nc-scan-auto/de.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-scan-auto/es.json b/etc/ncp-config.d/l10n/nc-scan-auto/es.json
index 9b3db338..9b3db338 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-scan-auto/es.json
+++ b/etc/ncp-config.d/l10n/nc-scan-auto/es.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-scan/de.json b/etc/ncp-config.d/l10n/nc-scan/de.json
index 3469297e..3469297e 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-scan/de.json
+++ b/etc/ncp-config.d/l10n/nc-scan/de.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-scan/es.json b/etc/ncp-config.d/l10n/nc-scan/es.json
index 0c30c724..0c30c724 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-scan/es.json
+++ b/etc/ncp-config.d/l10n/nc-scan/es.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-snapshot-auto/de.json b/etc/ncp-config.d/l10n/nc-snapshot-auto/de.json
index 75f71db5..75f71db5 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-snapshot-auto/de.json
+++ b/etc/ncp-config.d/l10n/nc-snapshot-auto/de.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-snapshot-auto/es.json b/etc/ncp-config.d/l10n/nc-snapshot-auto/es.json
index 31b15e13..31b15e13 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-snapshot-auto/es.json
+++ b/etc/ncp-config.d/l10n/nc-snapshot-auto/es.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-snapshot-sync/es.json b/etc/ncp-config.d/l10n/nc-snapshot-sync/es.json
index 963bc8cf..963bc8cf 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-snapshot-sync/es.json
+++ b/etc/ncp-config.d/l10n/nc-snapshot-sync/es.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-snapshot/de.json b/etc/ncp-config.d/l10n/nc-snapshot/de.json
index b236539b..b236539b 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-snapshot/de.json
+++ b/etc/ncp-config.d/l10n/nc-snapshot/de.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-snapshot/es.json b/etc/ncp-config.d/l10n/nc-snapshot/es.json
index 50ffa1e8..50ffa1e8 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-snapshot/es.json
+++ b/etc/ncp-config.d/l10n/nc-snapshot/es.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-static-IP/de.json b/etc/ncp-config.d/l10n/nc-static-IP/de.json
index 45f0038b..45f0038b 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-static-IP/de.json
+++ b/etc/ncp-config.d/l10n/nc-static-IP/de.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-static-IP/es.json b/etc/ncp-config.d/l10n/nc-static-IP/es.json
index 650eba25..650eba25 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-static-IP/es.json
+++ b/etc/ncp-config.d/l10n/nc-static-IP/es.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-swapfile/de.json b/etc/ncp-config.d/l10n/nc-swapfile/de.json
index 76fd573d..76fd573d 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-swapfile/de.json
+++ b/etc/ncp-config.d/l10n/nc-swapfile/de.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-swapfile/es.json b/etc/ncp-config.d/l10n/nc-swapfile/es.json
index c0269a92..c0269a92 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-swapfile/es.json
+++ b/etc/ncp-config.d/l10n/nc-swapfile/es.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-update/de.json b/etc/ncp-config.d/l10n/nc-update/de.json
index 054011ff..054011ff 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-update/de.json
+++ b/etc/ncp-config.d/l10n/nc-update/de.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-webui/de.json b/etc/ncp-config.d/l10n/nc-webui/de.json
index 4413d699..4413d699 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-webui/de.json
+++ b/etc/ncp-config.d/l10n/nc-webui/de.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-webui/es.json b/etc/ncp-config.d/l10n/nc-webui/es.json
index 9529e1c9..9529e1c9 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-webui/es.json
+++ b/etc/ncp-config.d/l10n/nc-webui/es.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-wifi/de.json b/etc/ncp-config.d/l10n/nc-wifi/de.json
index 6517b76e..6517b76e 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-wifi/de.json
+++ b/etc/ncp-config.d/l10n/nc-wifi/de.json
diff --git a/etc/nextcloudpi-config.d/l10n/nc-zram/es.json b/etc/ncp-config.d/l10n/nc-zram/es.json
index 31b15e13..31b15e13 100644
--- a/etc/nextcloudpi-config.d/l10n/nc-zram/es.json
+++ b/etc/ncp-config.d/l10n/nc-zram/es.json
diff --git a/etc/nextcloudpi-config.d/l10n/no-ip/es.json b/etc/ncp-config.d/l10n/no-ip/es.json
index 1dd828f8..1dd828f8 100644
--- a/etc/nextcloudpi-config.d/l10n/no-ip/es.json
+++ b/etc/ncp-config.d/l10n/no-ip/es.json
diff --git a/etc/nextcloudpi-config.d/l10n/samba/es.json b/etc/ncp-config.d/l10n/samba/es.json
index 98331947..98331947 100644
--- a/etc/nextcloudpi-config.d/l10n/samba/es.json
+++ b/etc/ncp-config.d/l10n/samba/es.json
diff --git a/etc/nextcloudpi-config.d/l10n/spDYN/es.json b/etc/ncp-config.d/l10n/spDYN/es.json
index 0dae7e41..0dae7e41 100644
--- a/etc/nextcloudpi-config.d/l10n/spDYN/es.json
+++ b/etc/ncp-config.d/l10n/spDYN/es.json
diff --git a/etc/nextcloudpi-config.d/l10n/unattended-upgrades/de.json b/etc/ncp-config.d/l10n/unattended-upgrades/de.json
index 1c63a5a9..1c63a5a9 100644
--- a/etc/nextcloudpi-config.d/l10n/unattended-upgrades/de.json
+++ b/etc/ncp-config.d/l10n/unattended-upgrades/de.json
diff --git a/etc/nextcloudpi-config.d/l10n/unattended-upgrades/es.json b/etc/ncp-config.d/l10n/unattended-upgrades/es.json
index 2e700e3e..2e700e3e 100644
--- a/etc/nextcloudpi-config.d/l10n/unattended-upgrades/es.json
+++ b/etc/ncp-config.d/l10n/unattended-upgrades/es.json
diff --git a/etc/nextcloudpi-config.d/letsencrypt.sh b/etc/ncp-config.d/letsencrypt.sh
index a0e34015..a0e34015 100644
--- a/etc/nextcloudpi-config.d/letsencrypt.sh
+++ b/etc/ncp-config.d/letsencrypt.sh
diff --git a/etc/nextcloudpi-config.d/modsecurity.sh b/etc/ncp-config.d/modsecurity.sh
index 9047e894..5bc4a4c0 100644
--- a/etc/nextcloudpi-config.d/modsecurity.sh
+++ b/etc/ncp-config.d/modsecurity.sh
@@ -31,7 +31,7 @@ install()
 
   cat >> /etc/modsecurity/crs/crs-setup.conf <<'EOF'
 
-  # NextCloudPi: allow PROPFIND for webDAV
+  # NextCloudPlus: allow PROPFIND for webDAV
   SecAction "id:900200, phase:1, nolog, pass, t:none, setvar:'tx.allowed_methods=GET HEAD POST OPTIONS PROPFIND'"
 EOF
 
diff --git a/etc/nextcloudpi-config.d/nc-admin.sh b/etc/ncp-config.d/nc-admin.sh
index 16cf79ce..16cf79ce 100644
--- a/etc/nextcloudpi-config.d/nc-admin.sh
+++ b/etc/ncp-config.d/nc-admin.sh
diff --git a/etc/nextcloudpi-config.d/nc-audit.sh b/etc/ncp-config.d/nc-audit.sh
index eb7fc320..69f21b0c 100644
--- a/etc/nextcloudpi-config.d/nc-audit.sh
+++ b/etc/ncp-config.d/nc-audit.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Launch security audit reports for NextCloudPi
+# Launch security audit reports for NextCloudPlus
 #
 # 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/etc/nextcloudpi-config.d/nc-automount.sh b/etc/ncp-config.d/nc-automount.sh
index 08cbc86a..19d91aea 100644
--- a/etc/nextcloudpi-config.d/nc-automount.sh
+++ b/etc/ncp-config.d/nc-automount.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Automount configuration for NextCloudPi
+# Automount configuration for NextCloudPlus
 #
 # 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/etc/nextcloudpi-config.d/nc-autoupdate-ncp.sh b/etc/ncp-config.d/nc-autoupdate-ncp.sh
index e7fdbc5c..29467f28 100644
--- a/etc/nextcloudpi-config.d/nc-autoupdate-ncp.sh
+++ b/etc/ncp-config.d/nc-autoupdate-ncp.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Automatically apply NextCloudPi updates
+# Automatically apply NextCloudPlus 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!
@@ -15,13 +15,13 @@
 
 ACTIVE_=no
 NOTIFYUSER_=admin
-DESCRIPTION="Automatically apply NextCloudPi updates"
+DESCRIPTION="Automatically apply NextCloudPlus updates"
 
 configure() 
 {
   [[ $ACTIVE_ != "yes" ]] && { 
     rm /etc/cron.daily/ncp-autoupdate
-    echo "automatic NextCloudPi updates disabled"
+    echo "automatic NextCloudPlus updates disabled"
     return 0
   }
 
@@ -30,12 +30,12 @@ configure()
 /usr/local/bin/ncp-test-updates && {
   /usr/local/bin/ncp-update
   sudo -u www-data php /var/www/nextcloud/occ notification:generate \
-    "$NOTIFYUSER_" "NextCloudPi " \
-       -l "NextCloudPi was updated to \$( cat /usr/local/etc/ncp-version )"
+    "$NOTIFYUSER_" "NextCloudPlus " \
+       -l "NextCloudPlus was updated to \$( cat /usr/local/etc/ncp-version )"
 }
 EOF
   chmod a+x /etc/cron.daily/ncp-autoupdate
-  echo "automatic NextCloudPi updates enabled"
+  echo "automatic NextCloudPlus updates enabled"
 }
 
 install() { :; }
diff --git a/etc/nextcloudpi-config.d/nc-backup-auto.sh b/etc/ncp-config.d/nc-backup-auto.sh
index d785eac9..d785eac9 100644
--- a/etc/nextcloudpi-config.d/nc-backup-auto.sh
+++ b/etc/ncp-config.d/nc-backup-auto.sh
diff --git a/etc/nextcloudpi-config.d/nc-backup.sh b/etc/ncp-config.d/nc-backup.sh
index 0a1c1a3a..0a1c1a3a 100644
--- a/etc/nextcloudpi-config.d/nc-backup.sh
+++ b/etc/ncp-config.d/nc-backup.sh
diff --git a/etc/nextcloudpi-config.d/nc-database.sh b/etc/ncp-config.d/nc-database.sh
index 9ab693c8..21c4ecb8 100644
--- a/etc/nextcloudpi-config.d/nc-database.sh
+++ b/etc/ncp-config.d/nc-database.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Data dir configuration script for NextCloudPi
+# Data dir configuration script for NextCloudPlus
 #
 # 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/etc/nextcloudpi-config.d/nc-datadir.sh b/etc/ncp-config.d/nc-datadir.sh
index dd21753a..b03bc5ad 100644
--- a/etc/nextcloudpi-config.d/nc-datadir.sh
+++ b/etc/ncp-config.d/nc-datadir.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Data dir configuration script for NextCloudPi
+# Data dir configuration script for NextCloudPlus
 #
 # 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/etc/nextcloudpi-config.d/nc-export-ncp.sh b/etc/ncp-config.d/nc-export-ncp.sh
index 70bcfc77..a630ad12 100644
--- a/etc/nextcloudpi-config.d/nc-export-ncp.sh
+++ b/etc/ncp-config.d/nc-export-ncp.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Export NextCloudPi configuration
+# Export NextCloudPlus configuration
 #
 #
 # Copyleft 2017 by Courtney Hicks
@@ -9,7 +9,7 @@
 
 DIR_=/media/USBdrive/
 
-DESCRIPTION="Export NextCloudPi configuration"
+DESCRIPTION="Export NextCloudPlus configuration"
 
 configure() 
 {
@@ -20,7 +20,7 @@ configure()
   mkdir -p /tmp/ncp-export
   cd /tmp/ncp-export || return 1
 
-  for file in /usr/local/etc/nextcloudpi-config.d/*; do
+  for file in /usr/local/etc/ncp-config.d/*; do
     VARS=( $( grep "^[[:alpha:]]\+_=" "$file" | cut -d= -f1 | sed 's|_$||' ) )
     VALS=( $( grep "^[[:alpha:]]\+_=" "$file" | cut -d= -f2 ) )
     local CONFIG=""
diff --git a/etc/nextcloudpi-config.d/nc-fix-permissions.sh b/etc/ncp-config.d/nc-fix-permissions.sh
index 9aa9f1ea..9aa9f1ea 100644
--- a/etc/nextcloudpi-config.d/nc-fix-permissions.sh
+++ b/etc/ncp-config.d/nc-fix-permissions.sh
diff --git a/etc/nextcloudpi-config.d/nc-format-USB.sh b/etc/ncp-config.d/nc-format-USB.sh
index fef1f287..fef1f287 100644
--- a/etc/nextcloudpi-config.d/nc-format-USB.sh
+++ b/etc/ncp-config.d/nc-format-USB.sh
diff --git a/etc/nextcloudpi-config.d/nc-forward-ports.sh b/etc/ncp-config.d/nc-forward-ports.sh
index 09123cb4..9820cd8c 100644
--- a/etc/nextcloudpi-config.d/nc-forward-ports.sh
+++ b/etc/ncp-config.d/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 NextCloudPlus
 #
 # 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!
@@ -18,7 +18,7 @@ HTTPPORT_=80
 DESCRIPTION="Set port forwarding to access from outside (UPnP)"
 
 INFOTITLE="Instructions for UPnP Port Forwarding"
-INFO="For NextCloudPi to be able to setup your ports, UPnP must be activated
+INFO="For NextCloudPlus to be able to setup your ports, UPnP must be activated
 in your router. Activate it now on your router admin webpage.
 
 ** UPnP is considered a security risk **
diff --git a/etc/nextcloudpi-config.d/nc-httpsonly.sh b/etc/ncp-config.d/nc-httpsonly.sh
index d015bc46..6f441108 100644
--- a/etc/nextcloudpi-config.d/nc-httpsonly.sh
+++ b/etc/ncp-config.d/nc-httpsonly.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# HTTPS rewrite configuration script for NextCloudPi
+# HTTPS rewrite configuration script for NextCloudPlus
 #
 # 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/etc/nextcloudpi-config.d/nc-import-ncp.sh b/etc/ncp-config.d/nc-import-ncp.sh
index afec2072..d33dca68 100644
--- a/etc/nextcloudpi-config.d/nc-import-ncp.sh
+++ b/etc/ncp-config.d/nc-import-ncp.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Import NextCloudPi configuration
+# Import NextCloudPlus configuration
 #
 #
 # Copyleft 2017 by Courtney Hicks
@@ -9,14 +9,14 @@
 
 FILE_=/media/USBdrive/ncp-config_xxxxxx.cfg
 
-DESCRIPTION="Import NextCloudPi configuration from file"
+DESCRIPTION="Import NextCloudPlus configuration from file"
 
 configure() 
 {
   [[ -f "$FILE_" ]] || { echo "export file $FILE_ does not exist"; return 1; }
 
-  source /usr/local/etc/library.sh       || return 1
-  cd /usr/local/etc/nextcloudpi-config.d || return 1
+  source /usr/local/etc/library.sh || return 1
+  cd /usr/local/etc/ncp-config.d   || return 1
 
   # extract export
   local TMP="/tmp/ncp-export"
@@ -33,7 +33,7 @@ configure()
     local SCRIPT="$( basename "$file" .cfg ).sh"
 
     # restore
-    [ -f /usr/local/etc/nextcloudpi-config.d/"$SCRIPT" ] && {
+    [ -f /usr/local/etc/ncp-config.d/"$SCRIPT" ] && {
       local VARS=( $( grep "^[[:alpha:]]\+=" "$file" | cut -d= -f1 ) )
       local VALS=( $( grep "^[[:alpha:]]\+=" "$file" | cut -d= -f2 ) )
       for i in $( seq 0 1 ${#VARS[@]} ); do
diff --git a/etc/nextcloudpi-config.d/nc-info.sh b/etc/ncp-config.d/nc-info.sh
index f31a3054..e4b08f07 100644
--- a/etc/nextcloudpi-config.d/nc-info.sh
+++ b/etc/ncp-config.d/nc-info.sh
@@ -13,7 +13,7 @@
 # More at: https://ownyourbits.com
 #
 
-DESCRIPTION="Print NextCloudPi system info"
+DESCRIPTION="Print NextCloudPlus system info"
 
 install()
 { 
diff --git a/etc/nextcloudpi-config.d/nc-init.sh b/etc/ncp-config.d/nc-init.sh
index 725cd87f..befc0b36 100644
--- a/etc/nextcloudpi-config.d/nc-init.sh
+++ b/etc/ncp-config.d/nc-init.sh
@@ -20,7 +20,7 @@ DBADMIN=ncadmin
 DESCRIPTION="(Re)initiate Nextcloud to a clean configuration"
 
 INFOTITLE="Clean NextCloud configuration"
-INFO="This action will configure NextCloud to NextCloudPi defaults.
+INFO="This action will configure NextCloud to NextCloudPlus defaults.
 
 ** YOUR CONFIGURATION WILL BE LOST **
 
@@ -113,11 +113,11 @@ EOF
   # 4 Byte UTF8 support
   sudo -u www-data php occ config:system:set mysql.utf8mb4 --type boolean --value="true"
 
-  # Default trusted domain ( only from nextcloudpi-config )
+  # Default trusted domain ( only from ncp-config )
   test -f /usr/local/bin/nextcloud-domain.sh && {
     test -f /.ncp-image || bash /usr/local/bin/nextcloud-domain.sh
   }
-  sudo -u www-data php occ config:system:set trusted_domains 5 --value="nextcloudpi.local"
+  sudo -u www-data php occ config:system:set trusted_domains 5 --value="nextcloudplus.local"
 
   # email
   sudo -u www-data php occ config:system:set mail_smtpmode     --value="php"
@@ -135,7 +135,7 @@ EOF
   }
 
   mysql nextcloud <<EOF
-replace into  oc_appconfig values ( 'theming', 'name'          , "NextCloudPi"             );
+replace into  oc_appconfig values ( 'theming', 'name'          , "NextCloudPlus"           );
 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/etc/nextcloudpi-config.d/nc-limits.sh b/etc/ncp-config.d/nc-limits.sh
index 0e5e2dc7..8902df5f 100644
--- a/etc/nextcloudpi-config.d/nc-limits.sh
+++ b/etc/ncp-config.d/nc-limits.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# System limit configurator for NextCloudPi
+# System limit configurator for NextCloudPlus
 #
 # 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!
@@ -19,7 +19,7 @@ MEMORYLIMIT_=768M
 PHPTHREADS_=0
 REDISMEM_=3gb
 
-DESCRIPTION="Configure system limits for NextCloudPi"
+DESCRIPTION="Configure system limits for NextCloudPlus"
 INFO="Set PHP threads to 0 in order to use all cores"
 
 configure()
diff --git a/etc/nextcloudpi-config.d/nc-nextcloud.sh b/etc/ncp-config.d/nc-nextcloud.sh
index 0eeea963..856a3799 100644
--- a/etc/nextcloudpi-config.d/nc-nextcloud.sh
+++ b/etc/ncp-config.d/nc-nextcloud.sh
@@ -31,7 +31,7 @@ INFOTITLE="NextCloud installation"
 INFO="This new installation will cleanup current
 NextCloud instance, including files and database.
 
-You can later use nc-init to configure to NextCloudPi defaults
+You can later use nc-init to configure to NextCloudPlus defaults
 
 ** perform backup before proceding **
 
@@ -40,7 +40,7 @@ You can use nc-backup "
 
 install()
 {
-  # During build, this step is run before nextcloudpi.sh. Avoid executing twice
+  # During build, this step is run before nextcloudplus.sh. Avoid executing twice
   [[ -f /usr/lib/systemd/system/nc-provisioning.service ]] && return 0
 
   # Optional packets for Nextcloud and Apps
diff --git a/etc/nextcloudpi-config.d/nc-notify-updates.sh b/etc/ncp-config.d/nc-notify-updates.sh
index 9d8e473d..8caac2e9 100644
--- a/etc/nextcloudpi-config.d/nc-notify-updates.sh
+++ b/etc/ncp-config.d/nc-notify-updates.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Use NC notifications to warn about NCP updates
+# Install the latest News third party app
 #
 # 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 @@
 ACTIVE_=yes
 USER_=admin
 
-DESCRIPTION="Notify in NC when a NextCloudPi update is available"
+DESCRIPTION="Notify in NC when a NextCloudPlus update is available"
 
 # check every hour
 CHECKINTERVAL=1
@@ -39,7 +39,7 @@ LATEST=/var/run/.ncp-latest-version
 NOTIFIED=/var/run/.ncp-version-notified
 
 test -e \$LATEST || exit 0;
-ncp-test-updates || { echo "NextCloudPi up to date"; exit 0; }
+ncp-test-updates || { echo "NextCloudPlus up to date"; exit 0; }
 
 test -e \$NOTIFIED && [[ "\$( cat \$LATEST )" == "\$( cat \$NOTIFIED )" ]] && { 
   echo "Found update from \$( cat \$VERFILE ) to \$( cat \$LATEST ). Already notified" 
@@ -52,7 +52,7 @@ IFACE=\$( ip r | grep "default via" | awk '{ print \$5 }' )
 IP=\$( ip a show dev "\$IFACE" | grep global | grep -oP '\d{1,3}(\.\d{1,3}){3}' | head -1 )
 
 sudo -u www-data php /var/www/nextcloud/occ notification:generate \
-  $USER_ "NextCloudPi update" \
+  $USER_ "NextCloudPlus update" \
      -l "Update from \$( cat \$VERFILE ) to \$( cat \$LATEST ) is available. Update from https://\$IP:4443"
 
 cat \$LATEST > \$NOTIFIED
@@ -83,7 +83,7 @@ echo -e "Packages automatically upgraded: \$PKGS\\n"
 
 # notify
 sudo -u www-data php /var/www/nextcloud/occ notification:generate \
-  $USER_ "NextCloudPi Unattended Upgrades" \
+  $USER_ "NextCloudPlus Unattended Upgrades" \
      -l "Packages automatically upgraded \$PKGS"
 EOF
   chmod +x /usr/local/bin/ncp-notify-unattended-upgrade
diff --git a/etc/nextcloudpi-config.d/nc-passwd.sh b/etc/ncp-config.d/nc-passwd.sh
index f5604137..ae3831fa 100644
--- a/etc/nextcloudpi-config.d/nc-passwd.sh
+++ b/etc/ncp-config.d/nc-passwd.sh
@@ -16,7 +16,7 @@
 PASSWORD_=ownyourbits
 CONFIRM_=ownyourbits
 
-DESCRIPTION="Change password for the NextCloudPi Panel"
+DESCRIPTION="Change password for the NextCloudPlus Panel"
 
 configure()
 {
diff --git a/etc/nextcloudpi-config.d/nc-ramlogs.sh b/etc/ncp-config.d/nc-ramlogs.sh
index 18a68fd8..ca5f113f 100644
--- a/etc/nextcloudpi-config.d/nc-ramlogs.sh
+++ b/etc/ncp-config.d/nc-ramlogs.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Data dir configuration script for NextCloudPi
+# Data dir configuration script for NextCloudPlus
 #
 # 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/etc/nextcloudpi-config.d/nc-restore.sh b/etc/ncp-config.d/nc-restore.sh
index e613cf32..e613cf32 100644
--- a/etc/nextcloudpi-config.d/nc-restore.sh
+++ b/etc/ncp-config.d/nc-restore.sh
diff --git a/etc/nextcloudpi-config.d/nc-rsync-auto.sh b/etc/ncp-config.d/nc-rsync-auto.sh
index eccddd83..eccddd83 100644
--- a/etc/nextcloudpi-config.d/nc-rsync-auto.sh
+++ b/etc/ncp-config.d/nc-rsync-auto.sh
diff --git a/etc/nextcloudpi-config.d/nc-rsync.sh b/etc/ncp-config.d/nc-rsync.sh
index c978a552..c978a552 100644
--- a/etc/nextcloudpi-config.d/nc-rsync.sh
+++ b/etc/ncp-config.d/nc-rsync.sh
diff --git a/etc/nextcloudpi-config.d/nc-scan-auto.sh b/etc/ncp-config.d/nc-scan-auto.sh
index 87d772a4..87d772a4 100644
--- a/etc/nextcloudpi-config.d/nc-scan-auto.sh
+++ b/etc/ncp-config.d/nc-scan-auto.sh
diff --git a/etc/nextcloudpi-config.d/nc-scan.sh b/etc/ncp-config.d/nc-scan.sh
index 0e30cc25..0e30cc25 100644
--- a/etc/nextcloudpi-config.d/nc-scan.sh
+++ b/etc/ncp-config.d/nc-scan.sh
diff --git a/etc/nextcloudpi-config.d/nc-snapshot-auto.sh b/etc/ncp-config.d/nc-snapshot-auto.sh
index 67efd559..84053656 100644
--- a/etc/nextcloudpi-config.d/nc-snapshot-auto.sh
+++ b/etc/ncp-config.d/nc-snapshot-auto.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# NextCloudPi scheduled datadir BTRFS snapshots 
+# NextCloudPlus 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!
diff --git a/etc/nextcloudpi-config.d/nc-snapshot-sync.sh b/etc/ncp-config.d/nc-snapshot-sync.sh
index 9f992f6a..9f992f6a 100644
--- a/etc/nextcloudpi-config.d/nc-snapshot-sync.sh
+++ b/etc/ncp-config.d/nc-snapshot-sync.sh
diff --git a/etc/nextcloudpi-config.d/nc-snapshot.sh b/etc/ncp-config.d/nc-snapshot.sh
index 9059ac7c..9059ac7c 100644
--- a/etc/nextcloudpi-config.d/nc-snapshot.sh
+++ b/etc/ncp-config.d/nc-snapshot.sh
diff --git a/etc/nextcloudpi-config.d/nc-static-IP.sh b/etc/ncp-config.d/nc-static-IP.sh
index 5ae006b7..73a2cc11 100644
--- a/etc/nextcloudpi-config.d/nc-static-IP.sh
+++ b/etc/ncp-config.d/nc-static-IP.sh
@@ -21,8 +21,8 @@ DESCRIPTION="Set up a static IP address (on), or DHCP (off)"
 configure() 
 {
   # delete NCP config
-  grep -q "^# NextCloudPi autogenerated" /etc/dhcpcd.conf && \
-    sed -i '/^# NextCloudPi autogenerated/,+6d' /etc/dhcpcd.conf
+  grep -q "^# NextCloudPlus autogenerated" /etc/dhcpcd.conf && \
+    sed -i '/^# NextCloudPlus autogenerated/,+6d' /etc/dhcpcd.conf
 
   [[ $ACTIVE_ != "yes" ]] && {
     systemctl restart dhcpcd
@@ -36,8 +36,8 @@ configure()
   [[ "$DNS" == "" ]] && DNS="$GW"
 
   cat >> /etc/dhcpcd.conf <<EOF
-# NextCloudPi autogenerated
-# don't modify! better use nextcloudpi-config
+# NextCloudPlus autogenerated
+# don't modify! better use ncp-config
 interface eth0
 static ip_address=$IP_/24
 static routers=$GW
diff --git a/etc/nextcloudpi-config.d/nc-swapfile.sh b/etc/ncp-config.d/nc-swapfile.sh
index 6f435c06..2852e0ec 100644
--- a/etc/nextcloudpi-config.d/nc-swapfile.sh
+++ b/etc/ncp-config.d/nc-swapfile.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Data dir configuration script for NextCloudPi
+# Data dir configuration script for NextCloudPlus
 #
 # 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/etc/nextcloudpi-config.d/nc-update.sh b/etc/ncp-config.d/nc-update.sh
index 13204ba9..056bf620 100644
--- a/etc/nextcloudpi-config.d/nc-update.sh
+++ b/etc/ncp-config.d/nc-update.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Data dir configuration script for NextCloudPi
+# Data dir configuration script for NextCloudPlus
 #
 # 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 @@
 # More at https://ownyourbits.com/
 #
 
-DESCRIPTION="Update NextCloudPi"
+DESCRIPTION="Update NextCloudPlus"
 
 configure()
 {
diff --git a/etc/nextcloudpi-config.d/nc-webui.sh b/etc/ncp-config.d/nc-webui.sh
index 4a1f7e5e..4a1f7e5e 100644
--- a/etc/nextcloudpi-config.d/nc-webui.sh
+++ b/etc/ncp-config.d/nc-webui.sh
diff --git a/etc/nextcloudpi-config.d/nc-wifi.sh b/etc/ncp-config.d/nc-wifi.sh
index ba0f180a..bac5d8f7 100644
--- a/etc/nextcloudpi-config.d/nc-wifi.sh
+++ b/etc/ncp-config.d/nc-wifi.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Data dir configuration script for NextCloudPi
+# Data dir configuration script for NextCloudPlus
 #
 # 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/etc/nextcloudpi-config.d/nc-zram.sh b/etc/ncp-config.d/nc-zram.sh
index 4644ff8d..7bdbfe44 100644
--- a/etc/nextcloudpi-config.d/nc-zram.sh
+++ b/etc/ncp-config.d/nc-zram.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# NextCloudPi ZRAM settings
+# NextCloudPlus 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!
diff --git a/etc/nextcloudpi-config.d/no-ip.sh b/etc/ncp-config.d/no-ip.sh
index cf3d8232..cf3d8232 100644
--- a/etc/nextcloudpi-config.d/no-ip.sh
+++ b/etc/ncp-config.d/no-ip.sh
diff --git a/etc/nextcloudpi-config.d/samba.sh b/etc/ncp-config.d/samba.sh
index 6a3910ce..3813de27 100644
--- a/etc/nextcloudpi-config.d/samba.sh
+++ b/etc/ncp-config.d/samba.sh
@@ -21,8 +21,7 @@ INFOTITLE="Instructions for external synchronization"
 INFO="If we intend to modify the data folder through SAMBA,
 then we have to synchronize NextCloud to make it aware of the changes.
 
-This can be done manually or automatically using 'nc-scan' and 'nc-scan-auto' 
-from 'nextcloudpi-config'"
+This can be done manually or automatically using 'nc-scan' and 'nc-scan-auto'"
 
 install()
 {
@@ -42,7 +41,7 @@ install()
 
   cat >> /etc/samba/smb.conf <<EOF
 
-# NextCloudPi automatically generated from here. Do not remove this comment
+# NextCloudPlus automatically generated from here. Do not remove this comment
 EOF
 }
 
@@ -69,11 +68,11 @@ configure()
   ################################
   
   # remove files from this line to the end
-  sed -i '/# NextCloudPi automatically/,/\$/d' /etc/samba/smb.conf
+  sed -i '/# NextCloudPlus 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
+# NextCloudPlus automatically generated from here. Do not remove this comment
 EOF
 
   # create a share per Nextcloud user
diff --git a/etc/nextcloudpi-config.d/spDYN.sh b/etc/ncp-config.d/spDYN.sh
index 8a929d32..99c63026 100644
--- a/etc/nextcloudpi-config.d/spDYN.sh
+++ b/etc/ncp-config.d/spDYN.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# spDYN setup for NextcloudPi
+# spDYN setup for NextcloudPlus
 #
 #
 # Copyleft 2017 by Timm Goldenstein
diff --git a/etc/nextcloudpi-config.d/unattended-upgrades.sh b/etc/ncp-config.d/unattended-upgrades.sh
index 92c3249e..4ced697e 100644
--- a/etc/nextcloudpi-config.d/unattended-upgrades.sh
+++ b/etc/ncp-config.d/unattended-upgrades.sh
@@ -31,7 +31,7 @@ configure()
 
   # It seems like the label Raspbian-Security does not work for Raspbian
   # See https://www.raspberrypi.org/forums/viewtopic.php?t=82863&p=585739
-  cat > /etc/apt/apt.conf.d/20nextcloudpi-upgrades <<EOF
+  cat > /etc/apt/apt.conf.d/20ncp-upgrades <<EOF
 APT::Periodic::Update-Package-Lists "1";
 APT::Periodic::Unattended-Upgrade "$AUTOUPGRADE";
 APT::Periodic::MaxAge "14"; 
diff --git a/etc/nextcloudpi-config.d/l10n/nc-autoupdate-ncp/de.json b/etc/nextcloudpi-config.d/l10n/nc-autoupdate-ncp/de.json
deleted file mode 100644
index ec3bb9f0..00000000
--- a/etc/nextcloudpi-config.d/l10n/nc-autoupdate-ncp/de.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{"translations": {
-    "nc-autoupdate-ncp": "Automatische NextCloudPi Updates"
-}}
\ No newline at end of file