diff --git a/CONFIGURATION.md b/CONFIGURATION.md
index f40e0171..ddb30348 100644
--- a/CONFIGURATION.md
+++ b/CONFIGURATION.md
@@ -11,7 +11,7 @@ Run `hstr --show-configuration` to determine what will be appended to your Bash
 
 For more configuration options details please refer to:
 
-* Bind HSTR to a [keyboard shortcut](#binding-hh-to-keyboard-shortcut)
+* Bind HSTR to a [keyboard shortcut](#binding-hstr-to-keyboard-shortcut)
     * [Bash Emacs keymap](#bash-emacs-keymap-default) (default)
     * [Bash Vim keymap](#bash-vim-keymap-default)
     * [zsh Emacs keymap](#zsh-emacs-keymap-default) (default)
diff --git a/build/debian/debian/changelog b/build/debian/debian/changelog
index ca94b1bf..b2a5e462 100644
--- a/build/debian/debian/changelog
+++ b/build/debian/debian/changelog
@@ -1,5 +1,5 @@
-hh (0.80-0ubuntu1) raring; urgency=low
+hstr (0.80-0ubuntu1) raring; urgency=low
 
-  * Fixed keyboard loop; Ctrl-r consistent shortcuts; propagation of the text from the prompt to HH.
+  * Fixed keyboard loop; Ctrl-r consistent shortcuts; propagation of the text from the prompt to HSTR.
 
 -- Martin Dvorak <martin.dvorak@mindforger.com> Wed, 25 Dec 2013 17:21:31 +0100
diff --git a/build/debian/make-deb.sh b/build/debian/make-deb.sh
index 593d21cd..c78d0b74 100755
--- a/build/debian/make-deb.sh
+++ b/build/debian/make-deb.sh
@@ -40,9 +40,9 @@ function createChangelog() {
 
   export MYTS=`date "+%a, %d %b %Y %H:%M:%S"`
   echo "Changelog timestamp: ${MYTS}"
-  echo -e "hstr (${HHFULLVERSION}) ${UBUNTUVERSION}; urgency=low" > $1
+  echo -e "hstr (${HSTRFULLVERSION}) ${DEBIANVERSION}; urgency=low" > $1
   echo " " >> $1
-  echo -e "  * ${HHBZRMSG}" >> $1
+  echo -e "  * ${HSTRBZRMSG}" >> $1
   echo " " >> $1
   echo " -- Martin Dvorak (Dvorka) <martin.dvorak@mindforger.com>  ${MYTS} +0100" >> $1
 }
@@ -55,11 +55,11 @@ function createTarball() {
   cd ..
   mkdir work
   cd work
-  cp -vrf ../${HH} .
-  tar zcf ../${HH}.tgz ${HH}
+  cp -vrf ../${HSTR} .
+  tar zcf ../${HSTR}.tgz ${HSTR}
   # .orig.tar.gz is required Debian convention
-  cp -vf ../${HH}.tgz ../${HH}.orig.tar.gz
-  cd ../${HH}
+  cp -vf ../${HSTR}.tgz ../${HSTR}.orig.tar.gz
+  cd ../${HSTR}
 }
 
 # ############################################################################
@@ -68,26 +68,26 @@ function createTarball() {
 
 function buildDebPackage() {
     export SCRIPTHOME=`pwd`
-    export HHVERSION=$1
-    export HHBZRMSG=$2
-    #export HHFULLVERSION=${HHVERSION}-1.0 # NMU upload
-    export HHFULLVERSION=${HHVERSION}-1    # mantainer upload
-    export HH=hstr_${HHVERSION}
-    export HHRELEASE=hh-${HHFULLVERSION}
-    export HHSRC=/home/dvorka/p/hstr/github/hstr
+    export HSTRVERSION=$1
+    export HSTRBZRMSG=$2
+    #export HSTRFULLVERSION=${HSTRVERSION}-1.0 # NMU upload
+    export HSTRFULLVERSION=${HSTRVERSION}-1    # mantainer upload
+    export HSTR=hstr_${HSTRVERSION}
+    export HSTRRELEASE=hstr-${HSTRFULLVERSION}
+    export HSTRSRC=/home/dvorka/p/hstr/github/hstr
     export NOW=`date +%Y-%m-%d--%H-%M-%S`
-    export HHBUILD=hstr-${NOW}
-    export UBUNTUVERSION=unstable
+    export HSTRBUILD=hstr-${NOW}
+    export DEBIANVERSION=unstable
     
     #
     # 1) create upstream tarball
     #
     # 1.1) get copy of project source
     echo -e "\n# Get HSTR project files ############################"
-    mkdir -p ${HHBUILD}/${HH}
-    cd ${HHBUILD}/${HH}
+    mkdir -p ${HSTRBUILD}/${HSTR}
+    cd ${HSTRBUILD}/${HSTR}
     # copy  project files to current directory
-    cp -rvf ${HHSRC}/* ${HHSRC}/*.*  .
+    cp -rvf ${HSTRSRC}/* ${HSTRSRC}/*.*  .
 
     # 1.x) generate makefiles
     cd build/tarball && ./tarball-automake.sh && cd ../.. && ./configure
@@ -104,7 +104,7 @@ function buildDebPackage() {
     # 2) create source deb
     #    
     # 2.1) add Debian control files
-    cp -rvf ${HHSRC}/build/debian/debian  .
+    cp -rvf ${HSTRSRC}/build/debian/debian  .
     createChangelog ./debian/changelog
 
     # x) start GPG agent if it's NOT running