diff --git a/apps/l3vpn/netl3vpn/src/main/java/org/onosproject/l3vpn/netl3vpn/impl/NetL3VpnUtil.java b/apps/l3vpn/netl3vpn/src/main/java/org/onosproject/l3vpn/netl3vpn/impl/NetL3VpnUtil.java
index 11674e4..55218a9 100644
--- a/apps/l3vpn/netl3vpn/src/main/java/org/onosproject/l3vpn/netl3vpn/impl/NetL3VpnUtil.java
+++ b/apps/l3vpn/netl3vpn/src/main/java/org/onosproject/l3vpn/netl3vpn/impl/NetL3VpnUtil.java
@@ -251,7 +251,7 @@
                 .addChild(DefaultDevices.class)
                 .addChild(DefaultDevice.class, devKeys)
                 .build();
-        return DefaultModelObjectData.builder().identifer(modelId)
+        return DefaultModelObjectData.builder().identifier(modelId)
                 .addModelObject((InnerModelObject) ins).build();
     }
 
@@ -270,7 +270,7 @@
         Device device = new DefaultDevice();
         device.deviceid(id);
         device.networkInstances(ins);
-        return DefaultModelObjectData.builder().identifer(modelId)
+        return DefaultModelObjectData.builder().identifier(modelId)
                 .addModelObject((InnerModelObject) device).build();
     }
 
@@ -320,7 +320,7 @@
                                   .ietfinterfaces.devices.DefaultDevice.class,
                           keys)
                 .build();
-        return DefaultModelObjectData.builder().identifer(modelId)
+        return DefaultModelObjectData.builder().identifier(modelId)
                 .addModelObject((InnerModelObject) ifs).build();
     }
 
diff --git a/apps/l3vpn/netl3vpn/src/main/java/org/onosproject/l3vpn/netl3vpn/impl/NetL3vpnManager.java b/apps/l3vpn/netl3vpn/src/main/java/org/onosproject/l3vpn/netl3vpn/impl/NetL3vpnManager.java
index 4ccf0a1..536a573 100644
--- a/apps/l3vpn/netl3vpn/src/main/java/org/onosproject/l3vpn/netl3vpn/impl/NetL3vpnManager.java
+++ b/apps/l3vpn/netl3vpn/src/main/java/org/onosproject/l3vpn/netl3vpn/impl/NetL3vpnManager.java
@@ -276,7 +276,7 @@
      */
     private ResourceId getResourceVal(ModelObjectId modelId) {
         DefaultModelObjectData.Builder data = DefaultModelObjectData.builder()
-                .identifer(modelId);
+                .identifier(modelId);
         ResourceData resData = modelConverter.createDataNode(data.build());
         return resData.resourceId();
     }
