diff --git a/server/src/com/cloud/api/ApiDispatcher.java b/server/src/com/cloud/api/ApiDispatcher.java
index 8c6b7f535d7..3a88155aebe 100755
--- a/server/src/com/cloud/api/ApiDispatcher.java
+++ b/server/src/com/cloud/api/ApiDispatcher.java
@@ -30,7 +30,6 @@ import java.util.regex.Matcher;
 
 import org.apache.log4j.Logger;
 
-import com.cloud.identity.dao.IdentityDao;
 import com.cloud.api.BaseCmd.CommandType;
 import com.cloud.api.commands.ListEventsCmd;
 import com.cloud.async.AsyncCommandQueued;
@@ -48,6 +47,7 @@ import com.cloud.utils.DateUtil;
 import com.cloud.utils.component.ComponentLocator;
 import com.cloud.utils.component.PluggableService;
 import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.uuididentity.dao.IdentityDao;
 
 /**
  * A class that dispatches API commands to the appropriate manager for execution.
diff --git a/server/src/com/cloud/api/IdentityTypeAdapter.java b/server/src/com/cloud/api/IdentityTypeAdapter.java
index 81bb93f18e6..e66ce984f83 100644
--- a/server/src/com/cloud/api/IdentityTypeAdapter.java
+++ b/server/src/com/cloud/api/IdentityTypeAdapter.java
@@ -19,8 +19,8 @@ package com.cloud.api;
 
 import java.lang.reflect.Type;
 
-import com.cloud.identity.dao.IdentityDao;
-import com.cloud.identity.dao.IdentityDaoImpl;
+import com.cloud.uuididentity.dao.IdentityDao;
+import com.cloud.uuididentity.dao.IdentityDaoImpl;
 import com.google.gson.Gson;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
diff --git a/server/src/com/cloud/api/response/ApiResponseSerializer.java b/server/src/com/cloud/api/response/ApiResponseSerializer.java
index 06e3f74475f..b7646847be8 100644
--- a/server/src/com/cloud/api/response/ApiResponseSerializer.java
+++ b/server/src/com/cloud/api/response/ApiResponseSerializer.java
@@ -41,11 +41,11 @@ import com.cloud.api.ResponseObject;
 import com.cloud.api.ResponseObjectTypeAdapter;
 import com.cloud.configuration.Config;
 import com.cloud.configuration.dao.ConfigurationDao;
-import com.cloud.identity.dao.IdentityDao;
-import com.cloud.identity.dao.IdentityDaoImpl;
 import com.cloud.utils.component.ComponentLocator;
 import com.cloud.utils.encoding.URLEncoder;
 import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.uuididentity.dao.IdentityDao;
+import com.cloud.uuididentity.dao.IdentityDaoImpl;
 import com.google.gson.Gson;
 import com.google.gson.annotations.SerializedName;
 
diff --git a/server/src/com/cloud/configuration/DefaultComponentLibrary.java b/server/src/com/cloud/configuration/DefaultComponentLibrary.java
index 6bb9608ef6b..e04946b7c4b 100755
--- a/server/src/com/cloud/configuration/DefaultComponentLibrary.java
+++ b/server/src/com/cloud/configuration/DefaultComponentLibrary.java
@@ -65,8 +65,6 @@ import com.cloud.host.dao.HostDetailsDaoImpl;
 import com.cloud.host.dao.HostTagsDaoImpl;
 import com.cloud.hypervisor.HypervisorGuruManagerImpl;
 import com.cloud.hypervisor.dao.HypervisorCapabilitiesDaoImpl;
-import com.cloud.identity.IdentityServiceImpl;
-import com.cloud.identity.dao.IdentityDaoImpl;
 import com.cloud.keystore.KeystoreDaoImpl;
 import com.cloud.keystore.KeystoreManagerImpl;
 import com.cloud.maint.UpgradeManagerImpl;
@@ -181,6 +179,8 @@ import com.cloud.utils.component.ComponentLocator.ComponentInfo;
 import com.cloud.utils.component.Manager;
 import com.cloud.utils.component.PluggableService;
 import com.cloud.utils.db.GenericDao;
+import com.cloud.uuididentity.IdentityServiceImpl;
+import com.cloud.uuididentity.dao.IdentityDaoImpl;
 import com.cloud.vm.ClusteredVirtualMachineManagerImpl;
 import com.cloud.vm.ItWorkDaoImpl;
 import com.cloud.vm.UserVmManagerImpl;
diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
index 1d2728011b2..da6d83414f3 100755
--- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
+++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
@@ -32,7 +32,6 @@ import javax.naming.ConfigurationException;
 
 import org.apache.log4j.Logger;
 
-import com.cloud.identity.dao.IdentityDao;
 import com.cloud.agent.AgentManager;
 import com.cloud.agent.api.AgentControlAnswer;
 import com.cloud.agent.api.Answer;
@@ -126,6 +125,7 @@ import com.cloud.utils.db.Transaction;
 import com.cloud.utils.events.SubscriptionMgr;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.utils.net.NetUtils;
+import com.cloud.uuididentity.dao.IdentityDao;
 import com.cloud.vm.ConsoleProxyVO;
 import com.cloud.vm.NicProfile;
 import com.cloud.vm.ReservationContext;
diff --git a/server/src/com/cloud/identity/IdentityServiceImpl.java b/server/src/com/cloud/uuididentity/IdentityServiceImpl.java
similarity index 96%
rename from server/src/com/cloud/identity/IdentityServiceImpl.java
rename to server/src/com/cloud/uuididentity/IdentityServiceImpl.java
index ffc1ab28574..167402b6252 100644
--- a/server/src/com/cloud/identity/IdentityServiceImpl.java
+++ b/server/src/com/cloud/uuididentity/IdentityServiceImpl.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * 
  */
-package com.cloud.identity;
+package com.cloud.uuididentity;
 
 import java.util.Map;
 
@@ -24,9 +24,9 @@ import javax.naming.ConfigurationException;
 
 import com.cloud.api.IdentityMapper;
 import com.cloud.api.IdentityService;
-import com.cloud.identity.dao.IdentityDao;
 import com.cloud.utils.component.Inject;
 import com.cloud.utils.component.Manager;
+import com.cloud.uuididentity.dao.IdentityDao;
 
 @Local(value = { IdentityService.class })
 public class IdentityServiceImpl implements Manager, IdentityService {
diff --git a/server/src/com/cloud/Identity/dao/IdentityDao.java b/server/src/com/cloud/uuididentity/dao/IdentityDao.java
similarity index 94%
rename from server/src/com/cloud/Identity/dao/IdentityDao.java
rename to server/src/com/cloud/uuididentity/dao/IdentityDao.java
index 88ac49ab188..ca0ea9106b1 100644
--- a/server/src/com/cloud/Identity/dao/IdentityDao.java
+++ b/server/src/com/cloud/uuididentity/dao/IdentityDao.java
@@ -16,7 +16,7 @@
  * 
  */
 
-package com.cloud.identity.dao;
+package com.cloud.uuididentity.dao;
 
 import com.cloud.api.IdentityMapper;
 import com.cloud.utils.db.GenericDao;
diff --git a/server/src/com/cloud/identity/dao/IdentityDaoImpl.java b/server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java
similarity index 96%
rename from server/src/com/cloud/identity/dao/IdentityDaoImpl.java
rename to server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java
index dddb5812b01..8c553aa8424 100644
--- a/server/src/com/cloud/identity/dao/IdentityDaoImpl.java
+++ b/server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * 
  */
-package com.cloud.identity.dao;
+package com.cloud.uuididentity.dao;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
diff --git a/server/src/com/cloud/Identity/dao/IdentityVO.java b/server/src/com/cloud/uuididentity/dao/IdentityVO.java
similarity index 93%
rename from server/src/com/cloud/Identity/dao/IdentityVO.java
rename to server/src/com/cloud/uuididentity/dao/IdentityVO.java
index 5b0097dc037..b40a034b88e 100644
--- a/server/src/com/cloud/Identity/dao/IdentityVO.java
+++ b/server/src/com/cloud/uuididentity/dao/IdentityVO.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * 
  */
-package com.cloud.identity.dao;
+package com.cloud.uuididentity.dao;
 
 import javax.persistence.Entity;