diff --git a/api/src/com/cloud/vm/NetworkConcierge.java b/api/src/com/cloud/vm/NetworkConcierge.java
index b2622de8207..b5979950391 100644
--- a/api/src/com/cloud/vm/NetworkConcierge.java
+++ b/api/src/com/cloud/vm/NetworkConcierge.java
@@ -11,7 +11,7 @@ import com.cloud.utils.component.Adapter;
 
 /**
  * NetworkConcierge reserves network settings for a VM based
- * on the NetworkCharacteristics given.  A Concierge must
+ * on the NetworkCharacteristics given.  A concierge must
  * return a unique name so we know to call it to release
  * the reservation. 
  *
diff --git a/core/src/com/cloud/vm/dao/InstanceGroupDaoImpl.java b/core/src/com/cloud/vm/dao/InstanceGroupDaoImpl.java
index fa1581e93c6..ad38184c6e8 100644
--- a/core/src/com/cloud/vm/dao/InstanceGroupDaoImpl.java
+++ b/core/src/com/cloud/vm/dao/InstanceGroupDaoImpl.java
@@ -33,7 +33,7 @@ public class InstanceGroupDaoImpl extends GenericDaoBase<InstanceGroupVO, Long>
         if (accountId != null) {
             sc.addAnd("accountId", SearchCriteria.Op.EQ, accountId);
         }
-        List<InstanceGroupVO> vmGroups = listActiveBy(sc);
+        List<InstanceGroupVO> vmGroups = listBy(sc);
         return ((vmGroups != null) && !vmGroups.isEmpty());
     }
     
@@ -42,7 +42,7 @@ public class InstanceGroupDaoImpl extends GenericDaoBase<InstanceGroupVO, Long>
 		SearchCriteria<InstanceGroupVO> sc = AccountIdNameSearch.create();
 		sc.setParameters("accountId", accountId);
 		sc.setParameters("groupName", name);
-		return findOneActiveBy(sc);
+		return findOneBy(sc);
 	}
 	
     @Override
@@ -56,6 +56,6 @@ public class InstanceGroupDaoImpl extends GenericDaoBase<InstanceGroupVO, Long>
     public List<InstanceGroupVO> listByAccountId(long id) {
         SearchCriteria<InstanceGroupVO> sc = AccountSearch.create();
         sc.setParameters("account", id);
-        return listActiveBy(sc);
+        return listBy(sc);
     }
 }
diff --git a/core/src/com/cloud/vm/dao/InstanceGroupVMMapDaoImpl.java b/core/src/com/cloud/vm/dao/InstanceGroupVMMapDaoImpl.java
index f64e3201714..7e61dad390a 100644
--- a/core/src/com/cloud/vm/dao/InstanceGroupVMMapDaoImpl.java
+++ b/core/src/com/cloud/vm/dao/InstanceGroupVMMapDaoImpl.java
@@ -35,14 +35,14 @@ public class InstanceGroupVMMapDaoImpl extends GenericDaoBase<InstanceGroupVMMap
     public List<InstanceGroupVMMapVO> listByInstanceId(long vmId) {
         SearchCriteria<InstanceGroupVMMapVO> sc = ListByVmId.create();
         sc.setParameters("instanceId", vmId);
-        return listActiveBy(sc);
+        return listBy(sc);
     }
     
     @Override
     public List<InstanceGroupVMMapVO> listByGroupId(long groupId) {
         SearchCriteria<InstanceGroupVMMapVO> sc = ListByGroupId.create();
         sc.setParameters("groupId", groupId);
-        return listActiveBy(sc);
+        return listBy(sc);
     }
     
 	@Override
diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
index 9357302c8a1..6e28eb2fdfa 100644
--- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
+++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
@@ -842,7 +842,7 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, VirtualMach
         if (s_logger.isDebugEnabled())
             s_logger.debug("Assign console proxy from a newly started instance for request from data center : " + dataCenterId);
 
-        Map<String, Object> context = createProxyInstance2(dataCenterId);
+        Map<String, Object> context = createProxyInstance(dataCenterId);
 
         long proxyVmId = (Long) context.get("proxyVmId");
         if (proxyVmId == 0) {
@@ -881,7 +881,7 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, VirtualMach
         if (s_logger.isDebugEnabled())
             s_logger.debug("Assign console proxy from a newly started instance for request from data center : " + dataCenterId);
 
-        Map<String, Object> context = createProxyInstance2(dataCenterId);
+        Map<String, Object> context = createProxyInstance(dataCenterId);
 
         long proxyVmId = (Long) context.get("proxyVmId");
         if (proxyVmId == 0) {