diff --git a/api/src/com/cloud/api/commands/CreateSSHKeyPairCmd.java b/api/src/com/cloud/api/commands/CreateSSHKeyPairCmd.java
index a38e1683f7e..99e61010a10 100644
--- a/api/src/com/cloud/api/commands/CreateSSHKeyPairCmd.java
+++ b/api/src/com/cloud/api/commands/CreateSSHKeyPairCmd.java
@@ -32,7 +32,7 @@ import com.cloud.user.UserContext;
 @Implementation(description="Create a new keypair and returns the private key", responseObject=SSHKeyPairResponse.class) 
 public class CreateSSHKeyPairCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(CreateSSHKeyPairCmd.class.getName());
-    private static final String s_name = "createkeypairresponse";
+    private static final String s_name = "createsshkeypairresponse";
     
     
     /////////////////////////////////////////////////////
diff --git a/api/src/com/cloud/api/commands/DeleteSSHKeyPairCmd.java b/api/src/com/cloud/api/commands/DeleteSSHKeyPairCmd.java
index 21fbe8e83d0..f6279e88712 100644
--- a/api/src/com/cloud/api/commands/DeleteSSHKeyPairCmd.java
+++ b/api/src/com/cloud/api/commands/DeleteSSHKeyPairCmd.java
@@ -31,7 +31,7 @@ import com.cloud.user.UserContext;
 @Implementation(description="Deletes a keypair by name", responseObject=SuccessResponse.class) 
 public class DeleteSSHKeyPairCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(CreateSSHKeyPairCmd.class.getName());
-    private static final String s_name = "deletekeypairresponse";
+    private static final String s_name = "deletesshkeypairresponse";
     
     
     /////////////////////////////////////////////////////
diff --git a/api/src/com/cloud/api/commands/ListSSHKeyPairsCmd.java b/api/src/com/cloud/api/commands/ListSSHKeyPairsCmd.java
index 8871e572bea..0723a9e2e0e 100644
--- a/api/src/com/cloud/api/commands/ListSSHKeyPairsCmd.java
+++ b/api/src/com/cloud/api/commands/ListSSHKeyPairsCmd.java
@@ -71,7 +71,7 @@ public class ListSSHKeyPairsCmd extends BaseListCmd {
 		List<SSHKeyPairResponse> responses = new ArrayList<SSHKeyPairResponse>();
 		for (SSHKeyPair result : resultList) {
 			SSHKeyPairResponse r = new SSHKeyPairResponse(result.getName(), result.getFingerprint());
-			r.setObjectName("keypair");
+			r.setObjectName("sshkeypair");
 			responses.add(r);
 		}
 		
diff --git a/api/src/com/cloud/api/commands/RegisterSSHKeyPairCmd.java b/api/src/com/cloud/api/commands/RegisterSSHKeyPairCmd.java
index 243df8b54c1..15aa96f2f5b 100644
--- a/api/src/com/cloud/api/commands/RegisterSSHKeyPairCmd.java
+++ b/api/src/com/cloud/api/commands/RegisterSSHKeyPairCmd.java
@@ -33,7 +33,7 @@ import com.cloud.user.UserContext;
 @Implementation(description="Register a public key in a keypair under a certain name", responseObject=SSHKeyPairResponse.class) 
 public class RegisterSSHKeyPairCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(RegisterSSHKeyPairCmd.class.getName());
-    private static final String s_name = "registerkeypairresponse";
+    private static final String s_name = "registersshkeypairresponse";
 	
    
     /////////////////////////////////////////////////////