diff --git a/debian/scripts/koha-create b/debian/scripts/koha-create
index 2636675038..b21e472a60 100755
--- a/debian/scripts/koha-create
+++ b/debian/scripts/koha-create
@@ -745,7 +745,7 @@ then
     then
         # Populate the database with default content.
         zcat "$DEFAULTSQL" |
-        sed "s/__KOHASITE__/$name/g" |
+        sed "s/__KOHASITE__/koha_$name/g" |
         mysql --host="$mysqlhost" --user="$mysqluser" --password="$mysqlpwd" "$mysqldb"
 
 
diff --git a/debian/scripts/koha-dump-defaults b/debian/scripts/koha-dump-defaults
index fb5e988067..21b1200bd6 100755
--- a/debian/scripts/koha-dump-defaults
+++ b/debian/scripts/koha-dump-defaults
@@ -33,4 +33,4 @@ mysqluser="$( xmlstarlet sel -t -v 'yazgfs/config/user' $kohaconfig )"
 mysqlpass="$( xmlstarlet sel -t -v 'yazgfs/config/pass' $kohaconfig )"
 mysqldump --databases --host="$mysqlhost" --user="$mysqluser" \
     --password="$mysqlpass" "$mysqldb" |
-    sed "s/$name/__KOHASITE__/g"
+    sed "s/koha_$name/__KOHASITE__/g"