diff --git a/cloud/nova_keypair b/cloud/nova_keypair
index 19d3fa49b95..18674a1220a 100644
--- a/cloud/nova_keypair
+++ b/cloud/nova_keypair
@@ -18,7 +18,7 @@
 # along with this software.  If not, see <http://www.gnu.org/licenses/>.
 
 try:
-    from novaclient.v1_1 import client
+    from novaclient.v1_1 import client as nova_client
     from novaclient import exceptions
     import time
 except ImportError: