diff --git a/tools/package/yangtools/pom.xml b/tools/package/yangtools/pom.xml
index ecbb972a99..2ee7b26af1 100644
--- a/tools/package/yangtools/pom.xml
+++ b/tools/package/yangtools/pom.xml
@@ -65,7 +65,7 @@
                         <configuration>
                             <transformers>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>org.onoproject.yangtool.YangLoaderMain</mainClass>
+                                    <mainClass>org.onosproject.yangtool.YangLoaderMain</mainClass>
                                 </transformer>
                             </transformers>
                         </configuration>
diff --git a/tools/package/yangtools/src/main/java/org/onoproject/yangtool/YangLoader.java b/tools/package/yangtools/src/main/java/org/onosproject/yangtool/YangLoader.java
similarity index 99%
rename from tools/package/yangtools/src/main/java/org/onoproject/yangtool/YangLoader.java
rename to tools/package/yangtools/src/main/java/org/onosproject/yangtool/YangLoader.java
index 371268904c..1c515f01bb 100644
--- a/tools/package/yangtools/src/main/java/org/onoproject/yangtool/YangLoader.java
+++ b/tools/package/yangtools/src/main/java/org/onosproject/yangtool/YangLoader.java
@@ -1,4 +1,4 @@
-package org.onoproject.yangtool;
+package org.onosproject.yangtool;
 
 import com.google.common.io.Files;
 import org.apache.commons.configuration.ConfigurationException;
diff --git a/tools/package/yangtools/src/main/java/org/onoproject/yangtool/YangLoaderMain.java b/tools/package/yangtools/src/main/java/org/onosproject/yangtool/YangLoaderMain.java
similarity index 92%
rename from tools/package/yangtools/src/main/java/org/onoproject/yangtool/YangLoaderMain.java
rename to tools/package/yangtools/src/main/java/org/onosproject/yangtool/YangLoaderMain.java
index 7b13767738..11fa4950c5 100644
--- a/tools/package/yangtools/src/main/java/org/onoproject/yangtool/YangLoaderMain.java
+++ b/tools/package/yangtools/src/main/java/org/onosproject/yangtool/YangLoaderMain.java
@@ -1,4 +1,4 @@
-package org.onoproject.yangtool;
+package org.onosproject.yangtool;
 
 import org.apache.commons.configuration.ConfigurationException;