diff --git a/src/main/java/org/onosproject/yangutils/translator/tojava/utils/JavaIdentifierSyntax.java b/src/main/java/org/onosproject/yangutils/translator/tojava/utils/JavaIdentifierSyntax.java
index cd26056..58005b1 100644
--- a/src/main/java/org/onosproject/yangutils/translator/tojava/utils/JavaIdentifierSyntax.java
+++ b/src/main/java/org/onosproject/yangutils/translator/tojava/utils/JavaIdentifierSyntax.java
@@ -50,7 +50,7 @@
         pkg = pkg + UtilConstants.PERIOD;
         pkg = pkg + getYangRevisionStr(revision);
 
-        return pkg;
+        return pkg.toLowerCase();
     }
 
     /**
@@ -126,11 +126,11 @@
      * Get the package from parent's package and string.
      *
      * @param parentPkg parent's package.
-     * @param childName child's name.
+     * @param parentName parent's name.
      * @return package string.
      */
-    public static String getPackageFromParent(String parentPkg, String childName) {
-        return parentPkg + UtilConstants.PERIOD + getSubPkgFromName(childName);
+    public static String getPackageFromParent(String parentPkg, String parentName) {
+        return (parentPkg + UtilConstants.PERIOD + getSubPkgFromName(parentName)).toLowerCase();
     }
 
     /**
