Index: utils/nbfake
==================================================================
--- utils/nbfake
+++ utils/nbfake
@@ -1,21 +1,30 @@
 #!/bin/bash
+
 
 # Can't always trust $PWD
-CURRWD=`pwd`
+CURRWD=$(pwd)
+
+# Make sure nbfake host and logfile are set. Fall back to old-style variable names
+
+if [[ -z "$NBFAKE_HOST" && -n "$TARGETHOST" ]];     then NBFAKE_HOST=$TARGETHOST;     fi
+
+if [[ -z "$NBFAKE_LOG" && -n "$TARGETHOST_LOGF" ]]; then NBFAKE_LOG=$TARGETHOST_LOGF; fi
+
+# Set default nbfake log
 
-if [[ $TARGETHOST_LOGF == "" ]]; then
-    TARGETHOST_LOGF=NBFAKE-`date +%GWW%V.%u_%T`
+if [[ -z "$NBFAKE_LOG" ]]; then
+    NBFAKE_LOG=NBFAKE-$(date +%GWW%V.%u_%T)
 fi
-echo "#======================================================================"
-echo "# NBFAKE Logging command to $TARGETHOST_LOGF"
-echo "#     \"$*\""
-echo "#======================================================================"
-
-if [[ $TARGETHOST == ""  ]]; then
-  unset TARGETHOST
-  TARGETHOST_LOGF_TEMP=$TARGETHOST_LOGF
-  unset TARGETHOST_LOGF
-  sh -c "cd $CURRWD;export DISPLAY=$DISPLAY; export PATH=$PATH; nohup $* >> $TARGETHOST_LOGF_TEMP 2>&1 &"
+
+cat <<__EOF >&2
+#======================================================================
+# NBFAKE logging command to: $NBFAKE_LOG
+#     $*
+#======================================================================
+__EOF
+
+if [[ -z "$NBFAKE_HOST" ]]; then
+  sh -c "cd $CURRWD;export DISPLAY=$DISPLAY; export PATH=$PATH; nohup $* >> $NBFAKE_LOG 2>&1 &"
 else
-  ssh -n -f $TARGETHOST "sh -c \"cd $CURRWD;export DISPLAY=$DISPLAY; export PATH=$PATH; nohup $* >> $TARGETHOST_LOGF 2>&1 &\""
+  ssh -n -f $NBFAKE_HOST "sh -c \"cd $CURRWD;export DISPLAY=$DISPLAY; export PATH=$PATH; nohup $* >> $NBFAKE_LOG 2>&1 &\""
 fi