Cleaning up the pom files and renaming modules for consistency in preparation for release.

Change-Id: I46142b291d744efbd38de6051fa6fb0966b29acc
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>