diff --git a/src/warden-client/lib/WardenClientCommon.pm b/src/warden-client/lib/WardenClientCommon.pm
index 6b6f5f6a0b2fc0fa6a7c0fdad5449417309bcccd..d4c957e0f9ce2228f31c8bce3ad333de13ed4899 100755
--- a/src/warden-client/lib/WardenClientCommon.pm
+++ b/src/warden-client/lib/WardenClientCommon.pm
@@ -29,19 +29,19 @@ sub errMsg
   defined $type or $type = "err"; # default type is err. Other: warn
   
   # check verbose logging
-  if (($type eq "err") && ($WardenCommon::LOG_VERBOSE)) {
+  if (($type eq "err") && ($WardenClientCommon::LOG_VERBOSE)) {
     $msg .= "\nStack info: " . Carp::longmess();
   }
 
   # check logging into STDERR
-  if ($WardenCommon::LOG_STDERR) {
+  if ($WardenClientCommon::LOG_STDERR) {
     print STDERR $msg . "\n";
   }
 
   # check logging into Syslog
-  if ($WardenCommon::SYSLOG) {
-    openlog("Warden-client:", "pid", "$WardenCommon::SYSLOG_FACILITY");
-    syslog("$type|$WardenCommon::SYSLOG_FACILITY", $msg . "\n");
+  if ($WardenClientCommon::SYSLOG) {
+    openlog("Warden-client:", "pid", "$WardenClientCommon::SYSLOG_FACILITY");
+    syslog("$type|$WardenClientCommon::SYSLOG_FACILITY", $msg . "\n");
     closelog();
   }
 
@@ -75,7 +75,7 @@ sub c2s
   } or return errMsg("Error in function 'c2s()' when creating SOAP::Transport::HTTP::Client object: " . $@);
  
   # setting of connection timeout
-  eval {$client->timeout($WardenCommon::CONNECTION_TIMEOUT);}
+  eval {$client->timeout($WardenClientCommon::CONNECTION_TIMEOUT);}
   or return errMsg("Error in function 'c2s()' when setting connection timeout: " . $@);
 
   # setting of SSL options
@@ -141,7 +141,7 @@ sub getClientInfo
   loadConf($conf_file);
 
   # obtain information about clients on Warden server
-  my $response = c2s($WardenCommon::URI, $WardenCommon::SSL_KEY, $WardenCommon::SSL_CERT, $WardenCommon::SSL_CA_CERT, "getClientInfo");
+  my $response = c2s($WardenClientCommon::URI, $WardenClientCommon::SSL_KEY, $WardenClientCommon::SSL_CERT, $WardenClientCommon::SSL_CA_CERT, "getClientInfo");
   defined $response or return; # receive data or return undef     
 
   # parse server response (SOAP data object)