diff --git a/src/warden-client/sh/install.sh b/src/warden-client/sh/install.sh
index 1061c7c0c81e491567829a0112a2eefd7bbd298e..ecb20afbbfb2888b72609a8cc92e241773edd2d7 100755
--- a/src/warden-client/sh/install.sh
+++ b/src/warden-client/sh/install.sh
@@ -53,7 +53,7 @@ errClean()
 {
         echo "FAILED!"
         echo -n "Error: " && cat "$err"
-        echo " -> Uninstalling server package ..."
+        echo " -> Uninstalling client package ..."
         for file in $(<"$manifest")
         do
                 rm -f "${basedir}/$file" 2> /dev/null
@@ -274,7 +274,7 @@ checkKey
 # check if SSL certificate is readable
 checkCert
 
-# create server configuration file
+# create client configuration file
 echo -n "Creating Warden client configuration file ... "
 doTemplate \
         _CERTFILE_      "$cert_file" \
diff --git a/src/warden-client/sh/update.sh b/src/warden-client/sh/update.sh
index 0a4a2ccd56447d1efcde6aceb7be3b28608b4623..522e1338c367c7fccf52b227b336dc84484c7b6f 100755
--- a/src/warden-client/sh/update.sh
+++ b/src/warden-client/sh/update.sh
@@ -267,10 +267,10 @@ echo "Update of Warden client package to $package_version ..."
 echo
 echo "------------------------- Dependencies check-in -------------------------"
 
-# check warden server directory
+# check warden client directory
 wardenDirChck
 
-# check previous Warden server instalation
+# check previous Warden client instalation
 oldPackageChck
 
 # Perl interpreter test
@@ -288,7 +288,7 @@ backup
 # obation owner of already installed Warden client
 obtainUser
 
-# make warden server directory
+# make warden client directory
 updateWardenDir || exit 1
 
 # update client configuration file