diff --git a/jjb/onos/onos-sonar.sh b/jjb/onos/onos-sonar.sh
index db2b298..07185c8 100644
--- a/jjb/onos/onos-sonar.sh
+++ b/jjb/onos/onos-sonar.sh
@@ -2,11 +2,11 @@
 ONOS_ROOT=`pwd`
 . tools/build/envDefaults
 
-SONAR_SCANNER=sonar-scanner-3.0.3.778
+SONAR_SCANNER_VERSION=sonar-scanner-3.0.3.778
 
-curl -L -o /tmp/sonar-scanner-cli.zip -X GET https://sonarsource.bintray.com/Distribution/sonar-scanner-cli/$SONAR_SCANNER.zip
+curl -L -o /tmp/sonar-scanner-cli.zip -X GET https://sonarsource.bintray.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-$SONAR_SCANNER_VERSION.zip
 unzip /tmp/sonar-scanner-cli.zip
 
-$SONAR_SCANNER/bin/sonar-scanner
+sonar-scanner-$SONAR_SCANNER_VERSION/bin/sonar-scanner