diff --git a/api/src/com/cloud/api/ApiConstants.java b/api/src/com/cloud/api/ApiConstants.java
index 61281e503b5..65626dd5490 100755
--- a/api/src/com/cloud/api/ApiConstants.java
+++ b/api/src/com/cloud/api/ApiConstants.java
@@ -309,6 +309,7 @@ public class ApiConstants {
     public static final String SERVICE = "service";
     public static final String ASSOCIATED_NETWORK_ID = "associatednetworkid";
     public static final String SOURCE_NAT_SUPPORTED = "sourcenatsupported";
+    public static final String RESOURCE_STATE = "resourcestate";
     
     public enum HostDetails {
         all, capacity, events, stats, min;
diff --git a/api/src/com/cloud/api/commands/ListHostsCmd.java b/api/src/com/cloud/api/commands/ListHostsCmd.java
old mode 100644
new mode 100755
index 55239ad73a5..d731f5e751e
--- a/api/src/com/cloud/api/commands/ListHostsCmd.java
+++ b/api/src/com/cloud/api/commands/ListHostsCmd.java
@@ -77,8 +77,8 @@ public class ListHostsCmd extends BaseListCmd {
     @Parameter(name=ApiConstants.VIRTUAL_MACHINE_ID, type=CommandType.LONG, required=false, description="lists hosts in the same cluster as this VM and flag hosts with enough CPU/RAm to host this VM")
     private Long virtualMachineId;
     
-    @Parameter(name=ApiConstants.ALLOCATION_STATE, type=CommandType.STRING, description="list hosts by allocation state")
-    private String allocationState;   
+    @Parameter(name=ApiConstants.RESOURCE_STATE, type=CommandType.STRING, description="list hosts by resource state. Resource state represents current state determined by admin of host, valule can be one of [Enabled, Disabled, Unmanaged, PrepareForMaintenance, ErrorInMaintenance, Maintenance, Error]")
+    private String resourceState;   
     
     @Parameter(name=ApiConstants.DETAILS, type=CommandType.LIST, collectionType=CommandType.STRING, description="comma separated list of host details requested, value can be a list of [ min, all, capacity, events, stats]" )
     private List<String> viewDetails; 
@@ -139,8 +139,8 @@ public class ListHostsCmd extends BaseListCmd {
         return dv;
     }
     
-    public String getAllocationState() {
-    	return allocationState;
+    public String getResourceState() {
+    	return resourceState;
     }
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index 90cc7e9987f..c9971e3bde5 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -854,9 +854,9 @@ public class ManagementServerImpl implements ManagementServer {
         Object cluster = cmd.getClusterId();
         Object id = cmd.getId();
         Object keyword = cmd.getKeyword();
-        Object allocationState = cmd.getAllocationState();
+        Object resourceState = cmd.getResourceState();
 
-        return searchForServers(cmd.getStartIndex(), cmd.getPageSizeVal(), name, type, state, zoneId, pod, cluster, id, keyword, allocationState);
+        return searchForServers(cmd.getStartIndex(), cmd.getPageSizeVal(), name, type, state, zoneId, pod, cluster, id, keyword, resourceState);
     }
 
     @Override
@@ -950,7 +950,7 @@ public class ManagementServerImpl implements ManagementServer {
     }
 
     private List<HostVO> searchForServers(Long startIndex, Long pageSize, Object name, Object type, Object state, Object zone, Object pod, Object cluster, Object id, Object keyword,
-            Object allocationState) {
+            Object resourceState) {
         Filter searchFilter = new Filter(HostVO.class, "id", Boolean.TRUE, startIndex, pageSize);
         SearchCriteria<HostVO> sc = _hostDao.createSearchCriteria();
 
@@ -986,8 +986,8 @@ public class ManagementServerImpl implements ManagementServer {
             sc.addAnd("clusterId", SearchCriteria.Op.EQ, cluster);
         }
 
-        if (allocationState != null) {
-            sc.addAnd("hostAllocationState", SearchCriteria.Op.EQ, allocationState);
+        if (resourceState != null) {
+            sc.addAnd("resourceState", SearchCriteria.Op.EQ, resourceState);
         }
 
         return _hostDao.search(sc, searchFilter);