diff --git a/server/src/com/cloud/Identity/dao/IdentityDao.java b/server/src/com/cloud/Identity/dao/IdentityDao.java
index e40c7087cf3..148fd97c92f 100644
--- a/server/src/com/cloud/Identity/dao/IdentityDao.java
+++ b/server/src/com/cloud/Identity/dao/IdentityDao.java
@@ -16,7 +16,7 @@
  * 
  */
 
-package com.cloud.Identity.dao;
+package com.cloud.identity.dao;
 
 import com.cloud.api.IdentityMapper;
 import com.cloud.utils.db.GenericDao;
diff --git a/server/src/com/cloud/Identity/dao/IdentityVO.java b/server/src/com/cloud/Identity/dao/IdentityVO.java
index 0d6cb4175f8..5b0097dc037 100644
--- a/server/src/com/cloud/Identity/dao/IdentityVO.java
+++ b/server/src/com/cloud/Identity/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.identity.dao;
 
 import javax.persistence.Entity;
 
diff --git a/server/src/com/cloud/api/ApiDispatcher.java b/server/src/com/cloud/api/ApiDispatcher.java
index 37d74169027..3658adefc87 100755
--- a/server/src/com/cloud/api/ApiDispatcher.java
+++ b/server/src/com/cloud/api/ApiDispatcher.java
@@ -40,8 +40,8 @@ import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.exception.PermissionDeniedException;
 import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.Identity.dao.IdentityDao;
-import com.cloud.Identity.dao.IdentityDaoImpl;
+import com.cloud.identity.dao.IdentityDao;
+import com.cloud.identity.dao.IdentityDaoImpl;
 import com.cloud.server.ManagementServer;
 import com.cloud.user.Account;
 import com.cloud.user.UserContext;
diff --git a/server/src/com/cloud/api/IdentityTypeAdapter.java b/server/src/com/cloud/api/IdentityTypeAdapter.java
index 611863b1d9b..81bb93f18e6 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.identity.dao.IdentityDao;
+import com.cloud.identity.dao.IdentityDaoImpl;
 import com.google.gson.Gson;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
diff --git a/server/src/com/cloud/configuration/DefaultComponentLibrary.java b/server/src/com/cloud/configuration/DefaultComponentLibrary.java
index b19e0995476..b8ff604d1c5 100755
--- a/server/src/com/cloud/configuration/DefaultComponentLibrary.java
+++ b/server/src/com/cloud/configuration/DefaultComponentLibrary.java
@@ -65,7 +65,8 @@ 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.dao.IdentityDaoImpl;
+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;
@@ -157,7 +158,6 @@ import com.cloud.utils.component.ComponentLibraryBase;
 import com.cloud.utils.component.ComponentLocator.ComponentInfo;
 import com.cloud.utils.component.Manager;
 import com.cloud.utils.db.GenericDao;
-import com.cloud.uuididentity.IdentityServiceImpl;
 import com.cloud.vm.ClusteredVirtualMachineManagerImpl;
 import com.cloud.vm.ItWorkDaoImpl;
 import com.cloud.vm.UserVmManagerImpl;
diff --git a/server/src/com/cloud/uuididentity/IdentityServiceImpl.java b/server/src/com/cloud/identity/IdentityServiceImpl.java
similarity index 92%
rename from server/src/com/cloud/uuididentity/IdentityServiceImpl.java
rename to server/src/com/cloud/identity/IdentityServiceImpl.java
index d6a5ec04f36..87c56dbe804 100644
--- a/server/src/com/cloud/uuididentity/IdentityServiceImpl.java
+++ b/server/src/com/cloud/identity/IdentityServiceImpl.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * 
  */
-package com.cloud.uuididentity;
+package com.cloud.identity;
 
 import java.util.Map;
 
@@ -24,7 +24,7 @@ import javax.naming.ConfigurationException;
 
 import com.cloud.api.IdentityMapper;
 import com.cloud.api.IdentityService;
-import com.cloud.Identity.dao.IdentityDao;
+import com.cloud.identity.dao.IdentityDao;
 import com.cloud.utils.component.Inject;
 import com.cloud.utils.component.Manager;
 
diff --git a/server/src/com/cloud/identity/dao/IdentityDaoImpl.java b/server/src/com/cloud/identity/dao/IdentityDaoImpl.java
index e3835366c61..db9cda80cfa 100644
--- a/server/src/com/cloud/identity/dao/IdentityDaoImpl.java
+++ b/server/src/com/cloud/identity/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.identity.dao;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;