diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/CreateStoragePoolCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/CreateStoragePoolCmd.java
index cae58886015..da9d3467792 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/storage/CreateStoragePoolCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/storage/CreateStoragePoolCmd.java
@@ -72,7 +72,7 @@ public class CreateStoragePoolCmd extends BaseCmd {
             required=true, description="the Zone ID for the storage pool")
     private Long zoneId;
     
-    @Parameter(name=ApiConstants.PROVIDER, type=CommandType.UUID,
+    @Parameter(name=ApiConstants.PROVIDER, type=CommandType.STRING,
             required=false, description="the storage provider uuid")
     private String storageProviderUuid;
     
diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java
index 5bc4d6e6a79..284d5530846 100644
--- a/api/src/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java
@@ -89,7 +89,7 @@ public class RegisterIsoCmd extends BaseCmd {
             description="Register iso for the project")
     private Long projectId;
     
-    @Parameter(name=ApiConstants.IMAGE_STORE_UUID, type=CommandType.UUID,
+    @Parameter(name=ApiConstants.IMAGE_STORE_UUID, type=CommandType.STRING,
             description="Image store uuid")
     private String imageStoreUuid;
 
diff --git a/api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java
index ed719671587..c9da0c28cd6 100644
--- a/api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java
@@ -111,7 +111,7 @@ public class RegisterTemplateCmd extends BaseCmd {
             description="Register template for the project")
     private Long projectId;
     
-    @Parameter(name=ApiConstants.IMAGE_STORE_UUID, type=CommandType.UUID,
+    @Parameter(name=ApiConstants.IMAGE_STORE_UUID, type=CommandType.STRING,
             description="Image store uuid")
     private String imageStoreUuid;
     
diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/UploadVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/UploadVolumeCmd.java
index 94c3d38e5a4..3b00ba0d4bb 100644
--- a/api/src/org/apache/cloudstack/api/command/user/volume/UploadVolumeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/volume/UploadVolumeCmd.java
@@ -68,7 +68,7 @@ public class UploadVolumeCmd extends BaseAsyncCmd {
     @Parameter(name=ApiConstants.CHECKSUM, type=CommandType.STRING, description="the MD5 checksum value of this volume")
     private String checksum;
     
-    @Parameter(name=ApiConstants.IMAGE_STORE_UUID, type=CommandType.UUID,
+    @Parameter(name=ApiConstants.IMAGE_STORE_UUID, type=CommandType.STRING,
             description="Image store uuid")
     private String imageStoreUuid;