--- a/flys-backend/contrib/import_river.sh	Thu Mar 07 16:02:33 2013 +0100
+++ b/flys-backend/contrib/import_river.sh	Thu Mar 07 16:06:44 2013 +0100
@@ -90,16 +90,16 @@
       shift
       break;;
     "-u"|"--username")
-      USER=$2
+      DBUSER=$2
       shift 2;;
     "-w"|"--password")
-      PASS=$2
+      DBPASS=$2
       shift 2;;
     "-h"|"--host")
-      HOST=$2
+      DBHOST=$2
       shift 2;;
     "-p"|"--port")
-      PORT=$2
+      DBPORT=$2
       shift 2;;
     "-l"|"--log-dir")
       LOG=$2
@@ -129,16 +129,16 @@
 done
 
 if [ -z $DBUSER ]; then
-  USER=$DEFAULT_USER
+  DBUSER=$DEFAULT_USER
 fi
 if [ -z $DBPASS ]; then
-  PASS=$DEFAULT_PASS
+  DBPASS=$DEFAULT_PASS
 fi
 if [ -z $DBPORT ]; then
-  PORT=$DEFAULT_PORT
+  DBPORT=$DEFAULT_PORT
 fi
 if [ -z $DBHOST ]; then
-  HOST=$DEFAULT_HOST
+  DBHOST=$DEFAULT_HOST
 fi
 if [ -z $BACKEND_NAME ]; then
   BACKEND_NAME=$DEFAULT_BACKEND_NAME