diff --git a/deps/install-non-oss.sh b/deps/install-non-oss.sh
index 28eb03e1562..af495e7cc21 100755
--- a/deps/install-non-oss.sh
+++ b/deps/install-non-oss.sh
@@ -8,7 +8,7 @@
 # with the License.  You may obtain a copy of the License at
 #
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -19,13 +19,17 @@
 mvn install:install-file -Dfile=cloud-iControl.jar      -DgroupId=com.cloud.com.f5     -DartifactId=icontrol        -Dversion=1.0   -Dpackaging=jar
 mvn install:install-file -Dfile=cloud-netscaler.jar     -DgroupId=com.cloud.com.citrix -DartifactId=netscaler       -Dversion=1.0   -Dpackaging=jar
 mvn install:install-file -Dfile=cloud-netscaler-sdx.jar -DgroupId=com.cloud.com.citrix -DartifactId=netscaler-sdx   -Dversion=1.0   -Dpackaging=jar
-# 
+
 # From http://support.netapp.com/  (not available online, contact your support representative)
 # Version: 4.0
+if [ -e cloud-manageontap.jar ]; then mv cloud-manageontap.jar manageontap.jar;  fi
 mvn install:install-file -Dfile=manageontap.jar   -DgroupId=com.cloud.com.netapp -DartifactId=manageontap     -Dversion=4.0   -Dpackaging=jar
-#
+
 # From https://my.vmware.com/group/vmware/get-download?downloadGroup=VSDK41
-# Version: 4.1, Release-date: 2010-07-13, Build: 257238 
+# Version: 4.1, Release-date: 2010-07-13, Build: 257238
+if [ -e vmware-apputils.jar ]; then mv vmware-apputils.jar  apputils.jar;  fi
+if [ -e vmware-vim.jar ];      then mv vmware-vim.jar       vim.jar;       fi
+if [ -e vmware-vim25.jar ];    then mv vmware-vim25.jar     vim25.jar;     fi
 mvn install:install-file -Dfile=vim25.jar        -DgroupId=com.cloud.com.vmware -DartifactId=vmware-vim25    -Dversion=4.1   -Dpackaging=jar
 mvn install:install-file -Dfile=apputils.jar     -DgroupId=com.cloud.com.vmware -DartifactId=vmware-apputils -Dversion=4.1   -Dpackaging=jar
 mvn install:install-file -Dfile=vim.jar          -DgroupId=com.cloud.com.vmware -DartifactId=vmware-vim      -Dversion=4.1   -Dpackaging=jar