diff --git a/datamodel/pom.xml b/datamodel/pom.xml
index aaf1803..3ff231d 100644
--- a/datamodel/pom.xml
+++ b/datamodel/pom.xml
@@ -19,16 +19,11 @@
 
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos-yangutils</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <artifactId>onos-yang-tools</artifactId>
+        <version>1.7-SNAPSHOT</version>
     </parent>
 
-    <artifactId>yangutils-datamodel</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
-    <name>onos-yang-utils-datamodel</name>
+    <artifactId>onos-yang-datamodel</artifactId>
     <packaging>jar</packaging>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
 </project>
diff --git a/plugin/pom.xml b/plugin/pom.xml
index ee692f2..6450149 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -19,24 +19,18 @@
 
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos-yangutils</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <artifactId>onos-yang-tools</artifactId>
+        <version>1.7-SNAPSHOT</version>
     </parent>
 
-    <artifactId>yangutils-maven-plugin</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
-    <name>onos-yang-utils-plugin</name>
+    <artifactId>onos-yang-maven-plugin</artifactId>
     <packaging>maven-plugin</packaging>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>yangutils-datamodel</artifactId>
-            <version>1.7.0-SNAPSHOT</version>
+            <artifactId>onos-yang-datamodel</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
diff --git a/pom.xml b/pom.xml
index 5d1d355..4233c48 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,9 +23,9 @@
         <version>1</version>
     </parent>
 
-    <artifactId>onos-yangutils</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
-    <name>onos-yang-utils</name>
+    <groupId>org.onosproject</groupId>
+    <artifactId>onos-yang-tools</artifactId>
+    <version>1.7-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>