diff --git a/src/test/java/org/onosproject/yangutils/linker/IntraFileUsesLinkingTest.java b/src/test/java/org/onosproject/yangutils/linker/IntraFileUsesLinkingTest.java
index 472d453..352b3d0 100644
--- a/src/test/java/org/onosproject/yangutils/linker/IntraFileUsesLinkingTest.java
+++ b/src/test/java/org/onosproject/yangutils/linker/IntraFileUsesLinkingTest.java
@@ -80,7 +80,7 @@
         leafInfo = leafIterator.next();
 
         // Check whether the information in the leaf is correct under grouping.
-        assertThat(leafInfo.getLeafName(), is("hello"));
+        assertThat(leafInfo.getName(), is("hello"));
         assertThat(leafInfo.getDataType().getDataTypeName(), is("String"));
         assertThat(leafInfo.getDataType().getDataType(), is(YangDataTypes.STRING));
 
@@ -96,7 +96,7 @@
         leafInfo = leafIterator.next();
 
         // Check whether the information in the leaf is correct under module.
-        assertThat(leafInfo.getLeafName(), is("hello"));
+        assertThat(leafInfo.getName(), is("hello"));
         assertThat(leafInfo.getDataType().getDataTypeName(), is("String"));
         assertThat(leafInfo.getDataType().getDataType(), is(YangDataTypes.STRING));
 
@@ -134,7 +134,7 @@
         leafInfo = leafIterator.next();
 
         // Check whether the information in the leaf is correct under grouping.
-        assertThat(leafInfo.getLeafName(), is("treat"));
+        assertThat(leafInfo.getName(), is("treat"));
         assertThat(leafInfo.getDataType().getDataTypeName(), is("String"));
         assertThat(leafInfo.getDataType().getDataType(), is(YangDataTypes.STRING));
 
@@ -149,7 +149,7 @@
         leafInfo = leafIterator.next();
 
         // Check whether the information in the leaf is correct under container which is under grouping.
-        assertThat(leafInfo.getLeafName(), is("leaf2"));
+        assertThat(leafInfo.getName(), is("leaf2"));
         assertThat(leafInfo.getDataType().getDataTypeName(), is("String"));
         assertThat(leafInfo.getDataType().getDataType(), is(YangDataTypes.STRING));
 
@@ -165,7 +165,7 @@
         leafInfo = leafIterator.next();
 
         // Check whether the information in the leaf is correct under module.
-        assertThat(leafInfo.getLeafName(), is("treat"));
+        assertThat(leafInfo.getName(), is("treat"));
         assertThat(leafInfo.getDataType().getDataTypeName(), is("String"));
         assertThat(leafInfo.getDataType().getDataType(), is(YangDataTypes.STRING));
 
@@ -180,7 +180,7 @@
         leafInfo = leafIterator.next();
 
         // Check whether the information in the leaf is correct under container which is under module.
-        assertThat(leafInfo.getLeafName(), is("leaf2"));
+        assertThat(leafInfo.getName(), is("leaf2"));
         assertThat(leafInfo.getDataType().getDataTypeName(), is("String"));
         assertThat(leafInfo.getDataType().getDataType(), is(YangDataTypes.STRING));
     }
@@ -227,7 +227,7 @@
         leafInfo = leafIterator.next();
 
         // Check whether the information in the leaf is correct under list which is under grouping.
-        assertThat(leafInfo.getLeafName(), is("invalid-interval"));
+        assertThat(leafInfo.getName(), is("invalid-interval"));
         assertThat(leafInfo.getDataType().getDataTypeName(), is("uint16"));
         assertThat(leafInfo.getDataType().getDataType(), is(YangDataTypes.UINT16));
         assertThat(leafInfo.getUnits(), is("\"seconds\""));
@@ -253,7 +253,7 @@
         leafInfo = leafIterator.next();
 
         // Check whether the information in the leaf is correct under list which is deep copied.
-        assertThat(leafInfo.getLeafName(), is("invalid-interval"));
+        assertThat(leafInfo.getName(), is("invalid-interval"));
         assertThat(leafInfo.getDataType().getDataTypeName(), is("uint16"));
         assertThat(leafInfo.getDataType().getDataType(), is(YangDataTypes.UINT16));
         assertThat(leafInfo.getUnits(), is("\"seconds\""));
@@ -282,7 +282,7 @@
         leafInfo = leafIterator.next();
 
         // Check whether the information in the leaf is correct under list which is deep copied.
-        assertThat(leafInfo.getLeafName(), is("invalid-interval"));
+        assertThat(leafInfo.getName(), is("invalid-interval"));
         assertThat(leafInfo.getDataType().getDataTypeName(), is("uint16"));
         assertThat(leafInfo.getDataType().getDataType(), is(YangDataTypes.UINT16));
         assertThat(leafInfo.getUnits(), is("\"seconds\""));
@@ -353,7 +353,7 @@
         leafInfo = leafIterator.next();
 
         // Check whether the information in the leaf is correct under design-container.
-        assertThat(leafInfo.getLeafName(), is("ink"));
+        assertThat(leafInfo.getName(), is("ink"));
         assertThat(leafInfo.getDataType().getDataTypeName(), is("int32"));
         assertThat(leafInfo.getDataType().getDataType(), is(YangDataTypes.INT32));
 
@@ -374,7 +374,7 @@
         leafInfo = leafIterator.next();
 
         // Check whether the information in the leaf is correct under correct-container.
-        assertThat(leafInfo.getLeafName(), is("newone"));
+        assertThat(leafInfo.getName(), is("newone"));
         assertThat(leafInfo.getDataType().getDataTypeName(), is("string"));
         assertThat(leafInfo.getDataType().getDataType(), is(YangDataTypes.STRING));
 
@@ -397,7 +397,7 @@
 
         // Check whether the information in the leaf is correct under container
         // which has been deep copied from grouping.
-        assertThat(leafInfo.getLeafName(), is("zip-code"));
+        assertThat(leafInfo.getName(), is("zip-code"));
         assertThat(leafInfo.getDataType().getDataTypeName(), is("string"));
         assertThat(leafInfo.getDataType().getDataType(), is(YangDataTypes.STRING));
 
@@ -426,7 +426,7 @@
         leafInfo = leafIterator.next();
 
         // Check whether the information in the leaf is correct under list which has been deep copied from grouping.
-        assertThat(leafInfo.getLeafName(), is("invalid-interval"));
+        assertThat(leafInfo.getName(), is("invalid-interval"));
         assertThat(leafInfo.getDataType().getDataTypeName(), is("uint16"));
         assertThat(leafInfo.getDataType().getDataType(), is(YangDataTypes.UINT16));
         assertThat(leafInfo.getUnits(), is("\"seconds\""));
@@ -441,7 +441,7 @@
         leafInfo = leafIterator.next();
 
         // Check whether the information in the leaf is correct under grouping.
-        assertThat(leafInfo.getLeafName(), is("zip-code"));
+        assertThat(leafInfo.getName(), is("zip-code"));
         assertThat(leafInfo.getDataType().getDataTypeName(), is("string"));
         assertThat(leafInfo.getDataType().getDataType(), is(YangDataTypes.STRING));
 
@@ -517,7 +517,7 @@
         leafInfo = leafIterator.next();
 
         // Check whether the information in the leaf is correct under grouping.
-        assertThat(leafInfo.getLeafName(), is("carry"));
+        assertThat(leafInfo.getName(), is("carry"));
         assertThat(leafInfo.getDataType().getDataTypeName(), is("string"));
         assertThat(leafInfo.getDataType().getDataType(), is(YangDataTypes.STRING));
 
@@ -550,7 +550,7 @@
         leafInfo = leafIterator.next();
 
         // Check whether the information in the leaf is correct under list.
-        assertThat(leafInfo.getLeafName(), is("invalid-interval"));
+        assertThat(leafInfo.getName(), is("invalid-interval"));
         assertThat(leafInfo.getDataType().getDataTypeName(), is("uint16"));
         assertThat(leafInfo.getDataType().getDataType(), is(YangDataTypes.UINT16));
     }
@@ -687,7 +687,7 @@
         leafInfo = leafIterator.next();
 
         // Check whether the information in the leaf is correct under grouping.
-        assertThat(leafInfo.getLeafName(), is("hello"));
+        assertThat(leafInfo.getName(), is("hello"));
         assertThat(leafInfo.getDataType().getDataTypeName(), is("String"));
         assertThat(leafInfo.getDataType().getDataType(), is(YangDataTypes.STRING));
 
@@ -761,7 +761,7 @@
         leafInfo = leafIterator.next();
 
         // Check whether the information in the leaf is correct under grouping.
-        assertThat(leafInfo.getLeafName(), is("hello"));
+        assertThat(leafInfo.getName(), is("hello"));
         assertThat(leafInfo.getDataType().getDataTypeName(), is("String"));
         assertThat(leafInfo.getDataType().getDataType(), is(YangDataTypes.STRING));
     }