diff --git a/apps/onos-app-dhcp/pom.xml b/apps/dhcp/pom.xml
similarity index 100%
rename from apps/onos-app-dhcp/pom.xml
rename to apps/dhcp/pom.xml
diff --git a/apps/onos-app-dhcp/src/main/java/org/onosproject/dhcp/DHCPService.java b/apps/dhcp/src/main/java/org/onosproject/dhcp/DHCPService.java
similarity index 100%
rename from apps/onos-app-dhcp/src/main/java/org/onosproject/dhcp/DHCPService.java
rename to apps/dhcp/src/main/java/org/onosproject/dhcp/DHCPService.java
diff --git a/apps/onos-app-dhcp/src/main/java/org/onosproject/dhcp/DHCPStore.java b/apps/dhcp/src/main/java/org/onosproject/dhcp/DHCPStore.java
similarity index 100%
rename from apps/onos-app-dhcp/src/main/java/org/onosproject/dhcp/DHCPStore.java
rename to apps/dhcp/src/main/java/org/onosproject/dhcp/DHCPStore.java
diff --git a/apps/onos-app-dhcp/src/main/java/org/onosproject/dhcp/IPAssignment.java b/apps/dhcp/src/main/java/org/onosproject/dhcp/IPAssignment.java
similarity index 100%
rename from apps/onos-app-dhcp/src/main/java/org/onosproject/dhcp/IPAssignment.java
rename to apps/dhcp/src/main/java/org/onosproject/dhcp/IPAssignment.java
diff --git a/apps/onos-app-dhcp/src/main/java/org/onosproject/dhcp/cli/DHCPLeaseDetails.java b/apps/dhcp/src/main/java/org/onosproject/dhcp/cli/DHCPLeaseDetails.java
similarity index 100%
rename from apps/onos-app-dhcp/src/main/java/org/onosproject/dhcp/cli/DHCPLeaseDetails.java
rename to apps/dhcp/src/main/java/org/onosproject/dhcp/cli/DHCPLeaseDetails.java
diff --git a/apps/onos-app-dhcp/src/main/java/org/onosproject/dhcp/cli/DHCPListAllMappings.java b/apps/dhcp/src/main/java/org/onosproject/dhcp/cli/DHCPListAllMappings.java
similarity index 100%
rename from apps/onos-app-dhcp/src/main/java/org/onosproject/dhcp/cli/DHCPListAllMappings.java
rename to apps/dhcp/src/main/java/org/onosproject/dhcp/cli/DHCPListAllMappings.java
diff --git a/apps/onos-app-dhcp/src/main/java/org/onosproject/dhcp/cli/DHCPRemoveStaticMapping.java b/apps/dhcp/src/main/java/org/onosproject/dhcp/cli/DHCPRemoveStaticMapping.java
similarity index 100%
rename from apps/onos-app-dhcp/src/main/java/org/onosproject/dhcp/cli/DHCPRemoveStaticMapping.java
rename to apps/dhcp/src/main/java/org/onosproject/dhcp/cli/DHCPRemoveStaticMapping.java
diff --git a/apps/onos-app-dhcp/src/main/java/org/onosproject/dhcp/cli/DHCPSetStaticMapping.java b/apps/dhcp/src/main/java/org/onosproject/dhcp/cli/DHCPSetStaticMapping.java
similarity index 100%
rename from apps/onos-app-dhcp/src/main/java/org/onosproject/dhcp/cli/DHCPSetStaticMapping.java
rename to apps/dhcp/src/main/java/org/onosproject/dhcp/cli/DHCPSetStaticMapping.java
diff --git a/apps/onos-app-dhcp/src/main/java/org/onosproject/dhcp/cli/FreeIPCompleter.java b/apps/dhcp/src/main/java/org/onosproject/dhcp/cli/FreeIPCompleter.java
similarity index 100%
rename from apps/onos-app-dhcp/src/main/java/org/onosproject/dhcp/cli/FreeIPCompleter.java
rename to apps/dhcp/src/main/java/org/onosproject/dhcp/cli/FreeIPCompleter.java
diff --git a/apps/onos-app-dhcp/src/main/java/org/onosproject/dhcp/cli/MacIdCompleter.java b/apps/dhcp/src/main/java/org/onosproject/dhcp/cli/MacIdCompleter.java
similarity index 100%
rename from apps/onos-app-dhcp/src/main/java/org/onosproject/dhcp/cli/MacIdCompleter.java
rename to apps/dhcp/src/main/java/org/onosproject/dhcp/cli/MacIdCompleter.java
diff --git a/apps/onos-app-dhcp/src/main/java/org/onosproject/dhcp/impl/DHCPConfig.java b/apps/dhcp/src/main/java/org/onosproject/dhcp/impl/DHCPConfig.java
similarity index 100%
rename from apps/onos-app-dhcp/src/main/java/org/onosproject/dhcp/impl/DHCPConfig.java
rename to apps/dhcp/src/main/java/org/onosproject/dhcp/impl/DHCPConfig.java
diff --git a/apps/onos-app-dhcp/src/main/java/org/onosproject/dhcp/impl/DHCPManager.java b/apps/dhcp/src/main/java/org/onosproject/dhcp/impl/DHCPManager.java
similarity index 100%
rename from apps/onos-app-dhcp/src/main/java/org/onosproject/dhcp/impl/DHCPManager.java
rename to apps/dhcp/src/main/java/org/onosproject/dhcp/impl/DHCPManager.java
diff --git a/apps/onos-app-dhcp/src/main/java/org/onosproject/dhcp/impl/DHCPStoreConfig.java b/apps/dhcp/src/main/java/org/onosproject/dhcp/impl/DHCPStoreConfig.java
similarity index 100%
rename from apps/onos-app-dhcp/src/main/java/org/onosproject/dhcp/impl/DHCPStoreConfig.java
rename to apps/dhcp/src/main/java/org/onosproject/dhcp/impl/DHCPStoreConfig.java
diff --git a/apps/onos-app-dhcp/src/main/java/org/onosproject/dhcp/impl/DistributedDHCPStore.java b/apps/dhcp/src/main/java/org/onosproject/dhcp/impl/DistributedDHCPStore.java
similarity index 100%
rename from apps/onos-app-dhcp/src/main/java/org/onosproject/dhcp/impl/DistributedDHCPStore.java
rename to apps/dhcp/src/main/java/org/onosproject/dhcp/impl/DistributedDHCPStore.java
diff --git a/apps/onos-app-dhcp/src/main/java/org/onosproject/dhcp/rest/DHCPWebResource.java b/apps/dhcp/src/main/java/org/onosproject/dhcp/rest/DHCPWebResource.java
similarity index 100%
rename from apps/onos-app-dhcp/src/main/java/org/onosproject/dhcp/rest/DHCPWebResource.java
rename to apps/dhcp/src/main/java/org/onosproject/dhcp/rest/DHCPWebResource.java
diff --git a/apps/onos-app-dhcp/src/main/resources/OSGI-INF/blueprint/shell-config.xml b/apps/dhcp/src/main/resources/OSGI-INF/blueprint/shell-config.xml
similarity index 100%
rename from apps/onos-app-dhcp/src/main/resources/OSGI-INF/blueprint/shell-config.xml
rename to apps/dhcp/src/main/resources/OSGI-INF/blueprint/shell-config.xml
diff --git a/apps/onos-app-dhcp/src/main/webapp/WEB-INF/web.xml b/apps/dhcp/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from apps/onos-app-dhcp/src/main/webapp/WEB-INF/web.xml
rename to apps/dhcp/src/main/webapp/WEB-INF/web.xml
diff --git a/apps/onos-app-dhcp/src/test/java/org/onosproject/dhcp/IPAssignmentTest.java b/apps/dhcp/src/test/java/org/onosproject/dhcp/IPAssignmentTest.java
similarity index 100%
rename from apps/onos-app-dhcp/src/test/java/org/onosproject/dhcp/IPAssignmentTest.java
rename to apps/dhcp/src/test/java/org/onosproject/dhcp/IPAssignmentTest.java
diff --git a/apps/onos-app-dhcp/src/test/java/org/onosproject/dhcp/impl/DHCPManagerTest.java b/apps/dhcp/src/test/java/org/onosproject/dhcp/impl/DHCPManagerTest.java
similarity index 100%
rename from apps/onos-app-dhcp/src/test/java/org/onosproject/dhcp/impl/DHCPManagerTest.java
rename to apps/dhcp/src/test/java/org/onosproject/dhcp/impl/DHCPManagerTest.java
diff --git a/apps/onos-app-dhcp/src/test/resources/dhcp-cfg.json b/apps/dhcp/src/test/resources/dhcp-cfg.json
similarity index 100%
rename from apps/onos-app-dhcp/src/test/resources/dhcp-cfg.json
rename to apps/dhcp/src/test/resources/dhcp-cfg.json
diff --git a/apps/pom.xml b/apps/pom.xml
index 3cbc905..e5ceddd 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -57,7 +57,7 @@
         <module>vtnrsc</module>
         <module>vtn</module>
         <module>vtnweb</module>
-        <module>onos-app-dhcp</module>
+        <module>dhcp</module>
     </modules>
 
     <properties>