diff --git a/models/huawei/src/main/yang/ne-bgpcomm-type.yang b/models/huawei/src/main/yang/ne-bgpcomm-type@2014-12-25.yang
similarity index 100%
rename from models/huawei/src/main/yang/ne-bgpcomm-type.yang
rename to models/huawei/src/main/yang/ne-bgpcomm-type@2014-12-25.yang
diff --git a/models/huawei/src/main/yang/ne-bgpcomm.yang b/models/huawei/src/main/yang/ne-bgpcomm@2014-12-25.yang
similarity index 100%
rename from models/huawei/src/main/yang/ne-bgpcomm.yang
rename to models/huawei/src/main/yang/ne-bgpcomm@2014-12-25.yang
diff --git a/models/huawei/src/main/yang/ne-l3vpn-api.yang b/models/huawei/src/main/yang/ne-l3vpn-api@2014-12-25.yang
similarity index 100%
rename from models/huawei/src/main/yang/ne-l3vpn-api.yang
rename to models/huawei/src/main/yang/ne-l3vpn-api@2014-12-25.yang
diff --git a/models/huawei/src/main/yang/ne-l3vpncomm-type.yang b/models/huawei/src/main/yang/ne-l3vpncomm-type@2014-12-25.yang
similarity index 100%
rename from models/huawei/src/main/yang/ne-l3vpncomm-type.yang
rename to models/huawei/src/main/yang/ne-l3vpncomm-type@2014-12-25.yang
diff --git a/models/huawei/src/main/yang/ne-l3vpncomm.yang b/models/huawei/src/main/yang/ne-l3vpncomm@2014-12-25.yang
similarity index 100%
rename from models/huawei/src/main/yang/ne-l3vpncomm.yang
rename to models/huawei/src/main/yang/ne-l3vpncomm@2014-12-25.yang
diff --git a/models/huawei/src/main/yang/ne-tnlm-type.yang b/models/huawei/src/main/yang/ne-tnlm-type@2014-12-25.yang
similarity index 100%
rename from models/huawei/src/main/yang/ne-tnlm-type.yang
rename to models/huawei/src/main/yang/ne-tnlm-type@2014-12-25.yang
diff --git a/models/huawei/src/main/yang/ne-tnlm.yang b/models/huawei/src/main/yang/ne-tnlm@2014-12-25.yang
similarity index 100%
rename from models/huawei/src/main/yang/ne-tnlm.yang
rename to models/huawei/src/main/yang/ne-tnlm@2014-12-25.yang
diff --git a/models/l3vpn/src/main/java/org.onosproject.models.l3vpn/L3VpnModelRegistrator.java b/models/l3vpn/src/main/java/org.onosproject.models.l3vpn/L3VpnModelRegistrator.java
index 3c34d1b..18cb01c 100644
--- a/models/l3vpn/src/main/java/org.onosproject.models.l3vpn/L3VpnModelRegistrator.java
+++ b/models/l3vpn/src/main/java/org.onosproject.models.l3vpn/L3VpnModelRegistrator.java
@@ -19,7 +19,11 @@
 import com.google.common.collect.ImmutableMap;
 import org.apache.felix.scr.annotations.Component;
 import org.onosproject.yang.AbstractYangModelRegistrator;
+import org.onosproject.yang.gen.v1.ietfbgpl3vpn.rev20160909.IetfBgpL3Vpn;
+import org.onosproject.yang.gen.v1.ietfinterfaces.rev20140508.IetfInterfaces;
+import org.onosproject.yang.gen.v1.ietfip.rev20140616.IetfIp;
 import org.onosproject.yang.gen.v1.ietfl3vpnsvc.rev20160730.IetfL3VpnSvc;
+import org.onosproject.yang.gen.v1.ietfnetworkinstance.rev20160623.IetfNetworkInstance;
 import org.onosproject.yang.gen.v1.l3vpnsvcext.rev20160730.L3VpnSvcExt;
 import org.onosproject.yang.model.DefaultYangModuleId;
 import org.onosproject.yang.model.YangModuleId;
@@ -49,6 +53,15 @@
                     new DefaultAppModuleInfo(IetfL3VpnSvc.class, null));
         appInfo.put(new DefaultYangModuleId("l3vpn-svc-ext", "2016-07-30"),
                     new DefaultAppModuleInfo(L3VpnSvcExt.class, null));
+        appInfo.put(new DefaultYangModuleId("ietf-interfaces", "2014-05-08"),
+                    new DefaultAppModuleInfo(IetfInterfaces.class, null));
+        appInfo.put(new DefaultYangModuleId("ietf-bgp-l3vpn", "2016-09-09"),
+                    new DefaultAppModuleInfo(IetfBgpL3Vpn.class, null));
+        appInfo.put(new DefaultYangModuleId("ietf-ip", "2014-06-16"),
+                    new DefaultAppModuleInfo(IetfIp.class, null));
+        appInfo.put(new DefaultYangModuleId("ietf-network-instance",
+                                            "2016-06-23"),
+                    new DefaultAppModuleInfo(IetfNetworkInstance.class, null));
         return ImmutableMap.copyOf(appInfo);
     }
 }
diff --git a/models/openconfig/src/main/yang/acl/openconfig-acl.yang b/models/openconfig/src/main/yang/acl/openconfig-acl@2017-05-26.yang
similarity index 100%
rename from models/openconfig/src/main/yang/acl/openconfig-acl.yang
rename to models/openconfig/src/main/yang/acl/openconfig-acl@2017-05-26.yang
diff --git a/models/openconfig/src/main/yang/acl/openconfig-packet-match-types.yang b/models/openconfig/src/main/yang/acl/openconfig-packet-match-types@2017-05-26.yang
similarity index 100%
rename from models/openconfig/src/main/yang/acl/openconfig-packet-match-types.yang
rename to models/openconfig/src/main/yang/acl/openconfig-packet-match-types@2017-05-26.yang
diff --git a/models/openconfig/src/main/yang/acl/openconfig-packet-match.yang b/models/openconfig/src/main/yang/acl/openconfig-packet-match@2017-05-26.yang
similarity index 100%
rename from models/openconfig/src/main/yang/acl/openconfig-packet-match.yang
rename to models/openconfig/src/main/yang/acl/openconfig-packet-match@2017-05-26.yang
diff --git a/models/openconfig/src/main/yang/aft/openconfig-aft-common.yang b/models/openconfig/src/main/yang/aft/openconfig-aft-common@2017-05-10.yang
similarity index 100%
rename from models/openconfig/src/main/yang/aft/openconfig-aft-common.yang
rename to models/openconfig/src/main/yang/aft/openconfig-aft-common@2017-05-10.yang
diff --git a/models/openconfig/src/main/yang/aft/openconfig-aft-ethernet.yang b/models/openconfig/src/main/yang/aft/openconfig-aft-ethernet@2017-05-10.yang
similarity index 100%
rename from models/openconfig/src/main/yang/aft/openconfig-aft-ethernet.yang
rename to models/openconfig/src/main/yang/aft/openconfig-aft-ethernet@2017-05-10.yang
diff --git a/models/openconfig/src/main/yang/aft/openconfig-aft-ipv4.yang b/models/openconfig/src/main/yang/aft/openconfig-aft-ipv4@2017-05-10.yang
similarity index 100%
rename from models/openconfig/src/main/yang/aft/openconfig-aft-ipv4.yang
rename to models/openconfig/src/main/yang/aft/openconfig-aft-ipv4@2017-05-10.yang
diff --git a/models/openconfig/src/main/yang/aft/openconfig-aft-ipv6.yang b/models/openconfig/src/main/yang/aft/openconfig-aft-ipv6@2017-05-10.yang
similarity index 100%
rename from models/openconfig/src/main/yang/aft/openconfig-aft-ipv6.yang
rename to models/openconfig/src/main/yang/aft/openconfig-aft-ipv6@2017-05-10.yang
diff --git a/models/openconfig/src/main/yang/aft/openconfig-aft-mpls.yang b/models/openconfig/src/main/yang/aft/openconfig-aft-mpls@2017-05-10.yang
similarity index 100%
rename from models/openconfig/src/main/yang/aft/openconfig-aft-mpls.yang
rename to models/openconfig/src/main/yang/aft/openconfig-aft-mpls@2017-05-10.yang
diff --git a/models/openconfig/src/main/yang/aft/openconfig-aft-network-instance.yang b/models/openconfig/src/main/yang/aft/openconfig-aft-network-instance@2017-01-13.yang
similarity index 100%
rename from models/openconfig/src/main/yang/aft/openconfig-aft-network-instance.yang
rename to models/openconfig/src/main/yang/aft/openconfig-aft-network-instance@2017-01-13.yang
diff --git a/models/openconfig/src/main/yang/aft/openconfig-aft-pf.yang b/models/openconfig/src/main/yang/aft/openconfig-aft-pf@2017-05-10.yang
similarity index 100%
rename from models/openconfig/src/main/yang/aft/openconfig-aft-pf.yang
rename to models/openconfig/src/main/yang/aft/openconfig-aft-pf@2017-05-10.yang
diff --git a/models/openconfig/src/main/yang/aft/openconfig-aft-types.yang b/models/openconfig/src/main/yang/aft/openconfig-aft-types@2017-05-10.yang
similarity index 100%
rename from models/openconfig/src/main/yang/aft/openconfig-aft-types.yang
rename to models/openconfig/src/main/yang/aft/openconfig-aft-types@2017-05-10.yang
diff --git a/models/openconfig/src/main/yang/aft/openconfig-aft.yang b/models/openconfig/src/main/yang/aft/openconfig-aft@2017-05-10.yang
similarity index 100%
rename from models/openconfig/src/main/yang/aft/openconfig-aft.yang
rename to models/openconfig/src/main/yang/aft/openconfig-aft@2017-05-10.yang
diff --git a/models/openconfig/src/main/yang/bgp/openconfig-bgp-common-multiprotocol.yang b/models/openconfig/src/main/yang/bgp/openconfig-bgp-common-multiprotocol@2017-07-30.yang
similarity index 100%
rename from models/openconfig/src/main/yang/bgp/openconfig-bgp-common-multiprotocol.yang
rename to models/openconfig/src/main/yang/bgp/openconfig-bgp-common-multiprotocol@2017-07-30.yang
diff --git a/models/openconfig/src/main/yang/bgp/openconfig-bgp-common-structure.yang b/models/openconfig/src/main/yang/bgp/openconfig-bgp-common-structure@2017-07-30.yang
similarity index 100%
rename from models/openconfig/src/main/yang/bgp/openconfig-bgp-common-structure.yang
rename to models/openconfig/src/main/yang/bgp/openconfig-bgp-common-structure@2017-07-30.yang
diff --git a/models/openconfig/src/main/yang/bgp/openconfig-bgp-common.yang b/models/openconfig/src/main/yang/bgp/openconfig-bgp-common@2017-07-30.yang
similarity index 100%
rename from models/openconfig/src/main/yang/bgp/openconfig-bgp-common.yang
rename to models/openconfig/src/main/yang/bgp/openconfig-bgp-common@2017-07-30.yang
diff --git a/models/openconfig/src/main/yang/bgp/openconfig-bgp-errors.yang b/models/openconfig/src/main/yang/bgp/openconfig-bgp-errors@2017-07-30.yang
similarity index 100%
rename from models/openconfig/src/main/yang/bgp/openconfig-bgp-errors.yang
rename to models/openconfig/src/main/yang/bgp/openconfig-bgp-errors@2017-07-30.yang
diff --git a/models/openconfig/src/main/yang/bgp/openconfig-bgp-global.yang b/models/openconfig/src/main/yang/bgp/openconfig-bgp-global@2017-07-30.yang
similarity index 100%
rename from models/openconfig/src/main/yang/bgp/openconfig-bgp-global.yang
rename to models/openconfig/src/main/yang/bgp/openconfig-bgp-global@2017-07-30.yang
diff --git a/models/openconfig/src/main/yang/bgp/openconfig-bgp-neighbor.yang b/models/openconfig/src/main/yang/bgp/openconfig-bgp-neighbor@2017-07-30.yang
similarity index 100%
rename from models/openconfig/src/main/yang/bgp/openconfig-bgp-neighbor.yang
rename to models/openconfig/src/main/yang/bgp/openconfig-bgp-neighbor@2017-07-30.yang
diff --git a/models/openconfig/src/main/yang/bgp/openconfig-bgp-peer-group.yang b/models/openconfig/src/main/yang/bgp/openconfig-bgp-peer-group@2017-07-30.yang
similarity index 100%
rename from models/openconfig/src/main/yang/bgp/openconfig-bgp-peer-group.yang
rename to models/openconfig/src/main/yang/bgp/openconfig-bgp-peer-group@2017-07-30.yang
diff --git a/models/openconfig/src/main/yang/bgp/openconfig-bgp-policy.yang b/models/openconfig/src/main/yang/bgp/openconfig-bgp-policy@2017-07-30.yang
similarity index 100%
rename from models/openconfig/src/main/yang/bgp/openconfig-bgp-policy.yang
rename to models/openconfig/src/main/yang/bgp/openconfig-bgp-policy@2017-07-30.yang
diff --git a/models/openconfig/src/main/yang/bgp/openconfig-bgp-types.yang b/models/openconfig/src/main/yang/bgp/openconfig-bgp-types@2017-07-30.yang
similarity index 100%
rename from models/openconfig/src/main/yang/bgp/openconfig-bgp-types.yang
rename to models/openconfig/src/main/yang/bgp/openconfig-bgp-types@2017-07-30.yang
diff --git a/models/openconfig/src/main/yang/bgp/openconfig-bgp.yang b/models/openconfig/src/main/yang/bgp/openconfig-bgp@2017-07-30.yang
similarity index 100%
rename from models/openconfig/src/main/yang/bgp/openconfig-bgp.yang
rename to models/openconfig/src/main/yang/bgp/openconfig-bgp@2017-07-30.yang
diff --git a/models/openconfig/src/main/yang/catalog/openconfig-catalog-types.yang b/models/openconfig/src/main/yang/catalog/openconfig-catalog-types@2017-05-01.yang
similarity index 100%
rename from models/openconfig/src/main/yang/catalog/openconfig-catalog-types.yang
rename to models/openconfig/src/main/yang/catalog/openconfig-catalog-types@2017-05-01.yang
diff --git a/models/openconfig/src/main/yang/catalog/openconfig-module-catalog.yang b/models/openconfig/src/main/yang/catalog/openconfig-module-catalog@2017-05-01.yang
similarity index 100%
rename from models/openconfig/src/main/yang/catalog/openconfig-module-catalog.yang
rename to models/openconfig/src/main/yang/catalog/openconfig-module-catalog@2017-05-01.yang
diff --git a/models/openconfig/src/main/yang/comm/iana-if-type.yang b/models/openconfig/src/main/yang/comm/iana-if-type@2017-03-30.yang
similarity index 100%
rename from models/openconfig/src/main/yang/comm/iana-if-type.yang
rename to models/openconfig/src/main/yang/comm/iana-if-type@2017-03-30.yang
diff --git a/models/openconfig/src/main/yang/comm/ietf-inet-types.yang b/models/openconfig/src/main/yang/comm/ietf-inet-types@2013-07-15.yang
similarity index 100%
rename from models/openconfig/src/main/yang/comm/ietf-inet-types.yang
rename to models/openconfig/src/main/yang/comm/ietf-inet-types@2013-07-15.yang
diff --git a/models/openconfig/src/main/yang/comm/ietf-interfaces.yang b/models/openconfig/src/main/yang/comm/ietf-interfaces@2014-05-08.yang
similarity index 100%
rename from models/openconfig/src/main/yang/comm/ietf-interfaces.yang
rename to models/openconfig/src/main/yang/comm/ietf-interfaces@2014-05-08.yang
diff --git a/models/openconfig/src/main/yang/comm/ietf-yang-types.yang b/models/openconfig/src/main/yang/comm/ietf-yang-types@2013-07-15.yang
similarity index 100%
rename from models/openconfig/src/main/yang/comm/ietf-yang-types.yang
rename to models/openconfig/src/main/yang/comm/ietf-yang-types@2013-07-15.yang
diff --git a/models/openconfig/src/main/yang/interfaces/openconfig-if-aggregate.yang b/models/openconfig/src/main/yang/interfaces/openconfig-if-aggregate@2017-07-14.yang
similarity index 100%
rename from models/openconfig/src/main/yang/interfaces/openconfig-if-aggregate.yang
rename to models/openconfig/src/main/yang/interfaces/openconfig-if-aggregate@2017-07-14.yang
diff --git a/models/openconfig/src/main/yang/interfaces/openconfig-if-ethernet.yang b/models/openconfig/src/main/yang/interfaces/openconfig-if-ethernet@2017-07-14.yang
similarity index 100%
rename from models/openconfig/src/main/yang/interfaces/openconfig-if-ethernet.yang
rename to models/openconfig/src/main/yang/interfaces/openconfig-if-ethernet@2017-07-14.yang
diff --git a/models/openconfig/src/main/yang/interfaces/openconfig-if-ip-ext.yang b/models/openconfig/src/main/yang/interfaces/openconfig-if-ip-ext@2017-07-14.yang
similarity index 100%
rename from models/openconfig/src/main/yang/interfaces/openconfig-if-ip-ext.yang
rename to models/openconfig/src/main/yang/interfaces/openconfig-if-ip-ext@2017-07-14.yang
diff --git a/models/openconfig/src/main/yang/interfaces/openconfig-if-ip.yang b/models/openconfig/src/main/yang/interfaces/openconfig-if-ip@2017-07-14.yang
similarity index 100%
rename from models/openconfig/src/main/yang/interfaces/openconfig-if-ip.yang
rename to models/openconfig/src/main/yang/interfaces/openconfig-if-ip@2017-07-14.yang
diff --git a/models/openconfig/src/main/yang/interfaces/openconfig-if-types.yang b/models/openconfig/src/main/yang/interfaces/openconfig-if-types@2016-11-14.yang
similarity index 100%
rename from models/openconfig/src/main/yang/interfaces/openconfig-if-types.yang
rename to models/openconfig/src/main/yang/interfaces/openconfig-if-types@2016-11-14.yang
diff --git a/models/openconfig/src/main/yang/interfaces/openconfig-interfaces.yang b/models/openconfig/src/main/yang/interfaces/openconfig-interfaces@2017-07-14.yang
similarity index 100%
rename from models/openconfig/src/main/yang/interfaces/openconfig-interfaces.yang
rename to models/openconfig/src/main/yang/interfaces/openconfig-interfaces@2017-07-14.yang
diff --git a/models/openconfig/src/main/yang/isis/openconfig-isis-lsdb-types.yang b/models/openconfig/src/main/yang/isis/openconfig-isis-lsdb-types@2017-07-26.yang
similarity index 100%
rename from models/openconfig/src/main/yang/isis/openconfig-isis-lsdb-types.yang
rename to models/openconfig/src/main/yang/isis/openconfig-isis-lsdb-types@2017-07-26.yang
diff --git a/models/openconfig/src/main/yang/isis/openconfig-isis-lsp.yang b/models/openconfig/src/main/yang/isis/openconfig-isis-lsp@2017-07-26.yang
similarity index 100%
rename from models/openconfig/src/main/yang/isis/openconfig-isis-lsp.yang
rename to models/openconfig/src/main/yang/isis/openconfig-isis-lsp@2017-07-26.yang
diff --git a/models/openconfig/src/main/yang/isis/openconfig-isis-policy.yang b/models/openconfig/src/main/yang/isis/openconfig-isis-policy@2017-07-26.yang
similarity index 100%
rename from models/openconfig/src/main/yang/isis/openconfig-isis-policy.yang
rename to models/openconfig/src/main/yang/isis/openconfig-isis-policy@2017-07-26.yang
diff --git a/models/openconfig/src/main/yang/isis/openconfig-isis-routing.yang b/models/openconfig/src/main/yang/isis/openconfig-isis-routing@2017-07-26.yang
similarity index 100%
rename from models/openconfig/src/main/yang/isis/openconfig-isis-routing.yang
rename to models/openconfig/src/main/yang/isis/openconfig-isis-routing@2017-07-26.yang
diff --git a/models/openconfig/src/main/yang/isis/openconfig-isis-types.yang b/models/openconfig/src/main/yang/isis/openconfig-isis-types@2017-07-26.yang
similarity index 100%
rename from models/openconfig/src/main/yang/isis/openconfig-isis-types.yang
rename to models/openconfig/src/main/yang/isis/openconfig-isis-types@2017-07-26.yang
diff --git a/models/openconfig/src/main/yang/isis/openconfig-isis.yang b/models/openconfig/src/main/yang/isis/openconfig-isis@2017-07-26.yang
similarity index 100%
rename from models/openconfig/src/main/yang/isis/openconfig-isis.yang
rename to models/openconfig/src/main/yang/isis/openconfig-isis@2017-07-26.yang
diff --git a/models/openconfig/src/main/yang/lacp/openconfig-lacp.yang b/models/openconfig/src/main/yang/lacp/openconfig-lacp@2017-05-05.yang
similarity index 100%
rename from models/openconfig/src/main/yang/lacp/openconfig-lacp.yang
rename to models/openconfig/src/main/yang/lacp/openconfig-lacp@2017-05-05.yang
diff --git a/models/openconfig/src/main/yang/lldp/openconfig-lldp-types.yang b/models/openconfig/src/main/yang/lldp/openconfig-lldp-types@2016-05-16.yang
similarity index 100%
rename from models/openconfig/src/main/yang/lldp/openconfig-lldp-types.yang
rename to models/openconfig/src/main/yang/lldp/openconfig-lldp-types@2016-05-16.yang
diff --git a/models/openconfig/src/main/yang/lldp/openconfig-lldp.yang b/models/openconfig/src/main/yang/lldp/openconfig-lldp@2016-05-16.yang
similarity index 100%
rename from models/openconfig/src/main/yang/lldp/openconfig-lldp.yang
rename to models/openconfig/src/main/yang/lldp/openconfig-lldp@2016-05-16.yang
diff --git a/models/openconfig/src/main/yang/local-routing/openconfig-local-routing.yang b/models/openconfig/src/main/yang/local-routing/openconfig-local-routing@2017-05-15.yang
similarity index 100%
rename from models/openconfig/src/main/yang/local-routing/openconfig-local-routing.yang
rename to models/openconfig/src/main/yang/local-routing/openconfig-local-routing@2017-05-15.yang
diff --git a/models/openconfig/src/main/yang/mpls/openconfig-mpls-igp.yang b/models/openconfig/src/main/yang/mpls/openconfig-mpls-igp@2017-05-15.yang
similarity index 100%
rename from models/openconfig/src/main/yang/mpls/openconfig-mpls-igp.yang
rename to models/openconfig/src/main/yang/mpls/openconfig-mpls-igp@2017-05-15.yang
diff --git a/models/openconfig/src/main/yang/mpls/openconfig-mpls-ldp.yang b/models/openconfig/src/main/yang/mpls/openconfig-mpls-ldp@2017-05-15.yang
similarity index 100%
rename from models/openconfig/src/main/yang/mpls/openconfig-mpls-ldp.yang
rename to models/openconfig/src/main/yang/mpls/openconfig-mpls-ldp@2017-05-15.yang
diff --git a/models/openconfig/src/main/yang/mpls/openconfig-mpls-rsvp.yang b/models/openconfig/src/main/yang/mpls/openconfig-mpls-rsvp@2017-05-15.yang
similarity index 100%
rename from models/openconfig/src/main/yang/mpls/openconfig-mpls-rsvp.yang
rename to models/openconfig/src/main/yang/mpls/openconfig-mpls-rsvp@2017-05-15.yang
diff --git a/models/openconfig/src/main/yang/mpls/openconfig-mpls-sr.yang b/models/openconfig/src/main/yang/mpls/openconfig-mpls-sr@2017-05-15.yang
similarity index 100%
rename from models/openconfig/src/main/yang/mpls/openconfig-mpls-sr.yang
rename to models/openconfig/src/main/yang/mpls/openconfig-mpls-sr@2017-05-15.yang
diff --git a/models/openconfig/src/main/yang/mpls/openconfig-mpls-static.yang b/models/openconfig/src/main/yang/mpls/openconfig-mpls-static@2017-05-15.yang
similarity index 100%
rename from models/openconfig/src/main/yang/mpls/openconfig-mpls-static.yang
rename to models/openconfig/src/main/yang/mpls/openconfig-mpls-static@2017-05-15.yang
diff --git a/models/openconfig/src/main/yang/mpls/openconfig-mpls-te.yang b/models/openconfig/src/main/yang/mpls/openconfig-mpls-te@2017-05-15.yang
similarity index 100%
rename from models/openconfig/src/main/yang/mpls/openconfig-mpls-te.yang
rename to models/openconfig/src/main/yang/mpls/openconfig-mpls-te@2017-05-15.yang
diff --git a/models/openconfig/src/main/yang/mpls/openconfig-mpls-types.yang b/models/openconfig/src/main/yang/mpls/openconfig-mpls-types@2017-05-15.yang
similarity index 100%
rename from models/openconfig/src/main/yang/mpls/openconfig-mpls-types.yang
rename to models/openconfig/src/main/yang/mpls/openconfig-mpls-types@2017-05-15.yang
diff --git a/models/openconfig/src/main/yang/mpls/openconfig-mpls.yang b/models/openconfig/src/main/yang/mpls/openconfig-mpls@2017-05-15.yang
similarity index 100%
rename from models/openconfig/src/main/yang/mpls/openconfig-mpls.yang
rename to models/openconfig/src/main/yang/mpls/openconfig-mpls@2017-05-15.yang
diff --git a/models/openconfig/src/main/yang/network-instance/openconfig-network-instance-l2.yang b/models/openconfig/src/main/yang/network-instance/openconfig-network-instance-l2@2017-02-28.yang
similarity index 100%
rename from models/openconfig/src/main/yang/network-instance/openconfig-network-instance-l2.yang
rename to models/openconfig/src/main/yang/network-instance/openconfig-network-instance-l2@2017-02-28.yang
diff --git a/models/openconfig/src/main/yang/network-instance/openconfig-network-instance-l3.yang b/models/openconfig/src/main/yang/network-instance/openconfig-network-instance-l3@2017-02-28.yang
similarity index 100%
rename from models/openconfig/src/main/yang/network-instance/openconfig-network-instance-l3.yang
rename to models/openconfig/src/main/yang/network-instance/openconfig-network-instance-l3@2017-02-28.yang
diff --git a/models/openconfig/src/main/yang/network-instance/openconfig-network-instance-policy.yang b/models/openconfig/src/main/yang/network-instance/openconfig-network-instance-policy@2017-02-15.yang
similarity index 100%
rename from models/openconfig/src/main/yang/network-instance/openconfig-network-instance-policy.yang
rename to models/openconfig/src/main/yang/network-instance/openconfig-network-instance-policy@2017-02-15.yang
diff --git a/models/openconfig/src/main/yang/network-instance/openconfig-network-instance-types.yang b/models/openconfig/src/main/yang/network-instance/openconfig-network-instance-types@2017-02-28.yang
similarity index 100%
rename from models/openconfig/src/main/yang/network-instance/openconfig-network-instance-types.yang
rename to models/openconfig/src/main/yang/network-instance/openconfig-network-instance-types@2017-02-28.yang
diff --git a/models/openconfig/src/main/yang/network-instance/openconfig-network-instance.yang b/models/openconfig/src/main/yang/network-instance/openconfig-network-instance@2017-02-28.yang
similarity index 100%
rename from models/openconfig/src/main/yang/network-instance/openconfig-network-instance.yang
rename to models/openconfig/src/main/yang/network-instance/openconfig-network-instance@2017-02-28.yang
diff --git a/models/openconfig/src/main/yang/openconfig-extensions.yang b/models/openconfig/src/main/yang/openconfig-extensions@2017-04-11.yang
similarity index 100%
rename from models/openconfig/src/main/yang/openconfig-extensions.yang
rename to models/openconfig/src/main/yang/openconfig-extensions@2017-04-11.yang
diff --git a/models/openconfig/src/main/yang/openflow/openconfig-openflow-types.yang b/models/openconfig/src/main/yang/openflow/openconfig-openflow-types@2017-06-01.yang
similarity index 100%
rename from models/openconfig/src/main/yang/openflow/openconfig-openflow-types.yang
rename to models/openconfig/src/main/yang/openflow/openconfig-openflow-types@2017-06-01.yang
diff --git a/models/openconfig/src/main/yang/openflow/openconfig-openflow.yang b/models/openconfig/src/main/yang/openflow/openconfig-openflow@2017-06-01.yang
similarity index 100%
rename from models/openconfig/src/main/yang/openflow/openconfig-openflow.yang
rename to models/openconfig/src/main/yang/openflow/openconfig-openflow@2017-06-01.yang
diff --git a/models/openconfig/src/main/yang/optical-transport/openconfig-channel-monitor.yang b/models/openconfig/src/main/yang/optical-transport/openconfig-channel-monitor@2017-07-08.yang
similarity index 100%
rename from models/openconfig/src/main/yang/optical-transport/openconfig-channel-monitor.yang
rename to models/openconfig/src/main/yang/optical-transport/openconfig-channel-monitor@2017-07-08.yang
diff --git a/models/openconfig/src/main/yang/optical-transport/openconfig-optical-amplifier.yang b/models/openconfig/src/main/yang/optical-transport/openconfig-optical-amplifier@2017-07-08.yang
similarity index 100%
rename from models/openconfig/src/main/yang/optical-transport/openconfig-optical-amplifier.yang
rename to models/openconfig/src/main/yang/optical-transport/openconfig-optical-amplifier@2017-07-08.yang
diff --git a/models/openconfig/src/main/yang/optical-transport/openconfig-terminal-device.yang b/models/openconfig/src/main/yang/optical-transport/openconfig-terminal-device@2017-07-08.yang
similarity index 100%
rename from models/openconfig/src/main/yang/optical-transport/openconfig-terminal-device.yang
rename to models/openconfig/src/main/yang/optical-transport/openconfig-terminal-device@2017-07-08.yang
diff --git a/models/openconfig/src/main/yang/optical-transport/openconfig-transport-line-common.yang b/models/openconfig/src/main/yang/optical-transport/openconfig-transport-line-common@2017-07-08.yang
similarity index 100%
rename from models/openconfig/src/main/yang/optical-transport/openconfig-transport-line-common.yang
rename to models/openconfig/src/main/yang/optical-transport/openconfig-transport-line-common@2017-07-08.yang
diff --git a/models/openconfig/src/main/yang/optical-transport/openconfig-transport-line-protection.yang b/models/openconfig/src/main/yang/optical-transport/openconfig-transport-line-protection@2017-07-08.yang
similarity index 100%
rename from models/openconfig/src/main/yang/optical-transport/openconfig-transport-line-protection.yang
rename to models/openconfig/src/main/yang/optical-transport/openconfig-transport-line-protection@2017-07-08.yang
diff --git a/models/openconfig/src/main/yang/optical-transport/openconfig-transport-types.yang b/models/openconfig/src/main/yang/optical-transport/openconfig-transport-types@2017-08-16.yang
similarity index 100%
rename from models/openconfig/src/main/yang/optical-transport/openconfig-transport-types.yang
rename to models/openconfig/src/main/yang/optical-transport/openconfig-transport-types@2017-08-16.yang
diff --git a/models/openconfig/src/main/yang/optical-transport/openconfig-wavelength-router.yang b/models/openconfig/src/main/yang/optical-transport/openconfig-wavelength-router@2017-07-08.yang
similarity index 100%
rename from models/openconfig/src/main/yang/optical-transport/openconfig-wavelength-router.yang
rename to models/openconfig/src/main/yang/optical-transport/openconfig-wavelength-router@2017-07-08.yang
diff --git a/models/openconfig/src/main/yang/ospf/openconfig-ospf-policy.yang b/models/openconfig/src/main/yang/ospf/openconfig-ospf-policy@2016-08-22.yang
similarity index 100%
rename from models/openconfig/src/main/yang/ospf/openconfig-ospf-policy.yang
rename to models/openconfig/src/main/yang/ospf/openconfig-ospf-policy@2016-08-22.yang
diff --git a/models/openconfig/src/main/yang/ospf/openconfig-ospf-types.yang b/models/openconfig/src/main/yang/ospf/openconfig-ospf-types@2017-02-28.yang
similarity index 100%
rename from models/openconfig/src/main/yang/ospf/openconfig-ospf-types.yang
rename to models/openconfig/src/main/yang/ospf/openconfig-ospf-types@2017-02-28.yang
diff --git a/models/openconfig/src/main/yang/ospf/openconfig-ospfv2-area-interface.yang b/models/openconfig/src/main/yang/ospf/openconfig-ospfv2-area-interface@2017-02-28.yang
similarity index 100%
rename from models/openconfig/src/main/yang/ospf/openconfig-ospfv2-area-interface.yang
rename to models/openconfig/src/main/yang/ospf/openconfig-ospfv2-area-interface@2017-02-28.yang
diff --git a/models/openconfig/src/main/yang/ospf/openconfig-ospfv2-area.yang b/models/openconfig/src/main/yang/ospf/openconfig-ospfv2-area@2017-02-28.yang
similarity index 100%
rename from models/openconfig/src/main/yang/ospf/openconfig-ospfv2-area.yang
rename to models/openconfig/src/main/yang/ospf/openconfig-ospfv2-area@2017-02-28.yang
diff --git a/models/openconfig/src/main/yang/ospf/openconfig-ospfv2-common.yang b/models/openconfig/src/main/yang/ospf/openconfig-ospfv2-common@2017-02-28.yang
similarity index 100%
rename from models/openconfig/src/main/yang/ospf/openconfig-ospfv2-common.yang
rename to models/openconfig/src/main/yang/ospf/openconfig-ospfv2-common@2017-02-28.yang
diff --git a/models/openconfig/src/main/yang/ospf/openconfig-ospfv2-global.yang b/models/openconfig/src/main/yang/ospf/openconfig-ospfv2-global@2017-02-28.yang
similarity index 100%
rename from models/openconfig/src/main/yang/ospf/openconfig-ospfv2-global.yang
rename to models/openconfig/src/main/yang/ospf/openconfig-ospfv2-global@2017-02-28.yang
diff --git a/models/openconfig/src/main/yang/ospf/openconfig-ospfv2-lsdb.yang b/models/openconfig/src/main/yang/ospf/openconfig-ospfv2-lsdb@2017-02-28.yang
similarity index 100%
rename from models/openconfig/src/main/yang/ospf/openconfig-ospfv2-lsdb.yang
rename to models/openconfig/src/main/yang/ospf/openconfig-ospfv2-lsdb@2017-02-28.yang
diff --git a/models/openconfig/src/main/yang/ospf/openconfig-ospfv2.yang b/models/openconfig/src/main/yang/ospf/openconfig-ospfv2@2017-02-28.yang
similarity index 100%
rename from models/openconfig/src/main/yang/ospf/openconfig-ospfv2.yang
rename to models/openconfig/src/main/yang/ospf/openconfig-ospfv2@2017-02-28.yang
diff --git a/models/openconfig/src/main/yang/platform/openconfig-platform-linecard.yang b/models/openconfig/src/main/yang/platform/openconfig-platform-linecard@2017-08-03.yang
similarity index 100%
rename from models/openconfig/src/main/yang/platform/openconfig-platform-linecard.yang
rename to models/openconfig/src/main/yang/platform/openconfig-platform-linecard@2017-08-03.yang
diff --git a/models/openconfig/src/main/yang/platform/openconfig-platform-port.yang b/models/openconfig/src/main/yang/platform/openconfig-platform-port@2016-10-24.yang
similarity index 100%
rename from models/openconfig/src/main/yang/platform/openconfig-platform-port.yang
rename to models/openconfig/src/main/yang/platform/openconfig-platform-port@2016-10-24.yang
diff --git a/models/openconfig/src/main/yang/platform/openconfig-platform-transceiver.yang b/models/openconfig/src/main/yang/platform/openconfig-platform-transceiver@2017-07-08.yang
similarity index 100%
rename from models/openconfig/src/main/yang/platform/openconfig-platform-transceiver.yang
rename to models/openconfig/src/main/yang/platform/openconfig-platform-transceiver@2017-07-08.yang
diff --git a/models/openconfig/src/main/yang/platform/openconfig-platform-types.yang b/models/openconfig/src/main/yang/platform/openconfig-platform-types@2017-08-16.yang
similarity index 100%
rename from models/openconfig/src/main/yang/platform/openconfig-platform-types.yang
rename to models/openconfig/src/main/yang/platform/openconfig-platform-types@2017-08-16.yang
diff --git a/models/openconfig/src/main/yang/platform/openconfig-platform.yang b/models/openconfig/src/main/yang/platform/openconfig-platform@2016-12-22.yang
similarity index 100%
rename from models/openconfig/src/main/yang/platform/openconfig-platform.yang
rename to models/openconfig/src/main/yang/platform/openconfig-platform@2016-12-22.yang
diff --git a/models/openconfig/src/main/yang/policy-forwarding/openconfig-pf-forwarding-policies.yang b/models/openconfig/src/main/yang/policy-forwarding/openconfig-pf-forwarding-policies@2017-06-21.yang
similarity index 100%
rename from models/openconfig/src/main/yang/policy-forwarding/openconfig-pf-forwarding-policies.yang
rename to models/openconfig/src/main/yang/policy-forwarding/openconfig-pf-forwarding-policies@2017-06-21.yang
diff --git a/models/openconfig/src/main/yang/policy-forwarding/openconfig-pf-interfaces.yang b/models/openconfig/src/main/yang/policy-forwarding/openconfig-pf-interfaces@2017-06-21.yang
similarity index 100%
rename from models/openconfig/src/main/yang/policy-forwarding/openconfig-pf-interfaces.yang
rename to models/openconfig/src/main/yang/policy-forwarding/openconfig-pf-interfaces@2017-06-21.yang
diff --git a/models/openconfig/src/main/yang/policy-forwarding/openconfig-pf-path-groups.yang b/models/openconfig/src/main/yang/policy-forwarding/openconfig-pf-path-groups@2017-06-21.yang
similarity index 100%
rename from models/openconfig/src/main/yang/policy-forwarding/openconfig-pf-path-groups.yang
rename to models/openconfig/src/main/yang/policy-forwarding/openconfig-pf-path-groups@2017-06-21.yang
diff --git a/models/openconfig/src/main/yang/policy-forwarding/openconfig-policy-forwarding.yang b/models/openconfig/src/main/yang/policy-forwarding/openconfig-policy-forwarding@2017-06-21.yang
similarity index 100%
rename from models/openconfig/src/main/yang/policy-forwarding/openconfig-policy-forwarding.yang
rename to models/openconfig/src/main/yang/policy-forwarding/openconfig-policy-forwarding@2017-06-21.yang
diff --git a/models/openconfig/src/main/yang/policy/openconfig-policy-types.yang b/models/openconfig/src/main/yang/policy/openconfig-policy-types@2017-07-14.yang
similarity index 100%
rename from models/openconfig/src/main/yang/policy/openconfig-policy-types.yang
rename to models/openconfig/src/main/yang/policy/openconfig-policy-types@2017-07-14.yang
diff --git a/models/openconfig/src/main/yang/policy/openconfig-routing-policy.yang b/models/openconfig/src/main/yang/policy/openconfig-routing-policy@2017-07-14.yang
similarity index 100%
rename from models/openconfig/src/main/yang/policy/openconfig-routing-policy.yang
rename to models/openconfig/src/main/yang/policy/openconfig-routing-policy@2017-07-14.yang
diff --git a/models/openconfig/src/main/yang/relay-agent/openconfig-relay-agent.yang b/models/openconfig/src/main/yang/relay-agent/openconfig-relay-agent@2016-05-16.yang
similarity index 100%
rename from models/openconfig/src/main/yang/relay-agent/openconfig-relay-agent.yang
rename to models/openconfig/src/main/yang/relay-agent/openconfig-relay-agent@2016-05-16.yang
diff --git a/models/openconfig/src/main/yang/rib/openconfig-rib-bgp-attributes.yang b/models/openconfig/src/main/yang/rib/openconfig-rib-bgp-attributes@2016-10-17.yang
similarity index 100%
rename from models/openconfig/src/main/yang/rib/openconfig-rib-bgp-attributes.yang
rename to models/openconfig/src/main/yang/rib/openconfig-rib-bgp-attributes@2016-10-17.yang
diff --git a/models/openconfig/src/main/yang/rib/openconfig-rib-bgp-ext.yang b/models/openconfig/src/main/yang/rib/openconfig-rib-bgp-ext@2016-10-17.yang
similarity index 100%
rename from models/openconfig/src/main/yang/rib/openconfig-rib-bgp-ext.yang
rename to models/openconfig/src/main/yang/rib/openconfig-rib-bgp-ext@2016-10-17.yang
diff --git a/models/openconfig/src/main/yang/rib/openconfig-rib-bgp-shared-attributes.yang b/models/openconfig/src/main/yang/rib/openconfig-rib-bgp-shared-attributes@2016-10-17.yang
similarity index 100%
rename from models/openconfig/src/main/yang/rib/openconfig-rib-bgp-shared-attributes.yang
rename to models/openconfig/src/main/yang/rib/openconfig-rib-bgp-shared-attributes@2016-10-17.yang
diff --git a/models/openconfig/src/main/yang/rib/openconfig-rib-bgp-table-attributes.yang b/models/openconfig/src/main/yang/rib/openconfig-rib-bgp-table-attributes@2016-10-17.yang
similarity index 100%
rename from models/openconfig/src/main/yang/rib/openconfig-rib-bgp-table-attributes.yang
rename to models/openconfig/src/main/yang/rib/openconfig-rib-bgp-table-attributes@2016-10-17.yang
diff --git a/models/openconfig/src/main/yang/rib/openconfig-rib-bgp-tables.yang b/models/openconfig/src/main/yang/rib/openconfig-rib-bgp-tables@2016-10-17.yang
similarity index 100%
rename from models/openconfig/src/main/yang/rib/openconfig-rib-bgp-tables.yang
rename to models/openconfig/src/main/yang/rib/openconfig-rib-bgp-tables@2016-10-17.yang
diff --git a/models/openconfig/src/main/yang/rib/openconfig-rib-bgp-types.yang b/models/openconfig/src/main/yang/rib/openconfig-rib-bgp-types@2016-10-17.yang
similarity index 100%
rename from models/openconfig/src/main/yang/rib/openconfig-rib-bgp-types.yang
rename to models/openconfig/src/main/yang/rib/openconfig-rib-bgp-types@2016-10-17.yang
diff --git a/models/openconfig/src/main/yang/rib/openconfig-rib-bgp.yang b/models/openconfig/src/main/yang/rib/openconfig-rib-bgp@2016-10-17.yang
similarity index 100%
rename from models/openconfig/src/main/yang/rib/openconfig-rib-bgp.yang
rename to models/openconfig/src/main/yang/rib/openconfig-rib-bgp@2016-10-17.yang
diff --git a/models/openconfig/src/main/yang/segment-routing/openconfig-rsvp-sr-ext.yang b/models/openconfig/src/main/yang/segment-routing/openconfig-rsvp-sr-ext@2017-03-06.yang
similarity index 100%
rename from models/openconfig/src/main/yang/segment-routing/openconfig-rsvp-sr-ext.yang
rename to models/openconfig/src/main/yang/segment-routing/openconfig-rsvp-sr-ext@2017-03-06.yang
diff --git a/models/openconfig/src/main/yang/segment-routing/openconfig-segment-routing.yang b/models/openconfig/src/main/yang/segment-routing/openconfig-segment-routing@2017-01-12.yang
similarity index 100%
rename from models/openconfig/src/main/yang/segment-routing/openconfig-segment-routing.yang
rename to models/openconfig/src/main/yang/segment-routing/openconfig-segment-routing@2017-01-12.yang
diff --git a/models/openconfig/src/main/yang/stp/openconfig-spanning-tree-types.yang b/models/openconfig/src/main/yang/stp/openconfig-spanning-tree-types@2017-07-14.yang
similarity index 100%
rename from models/openconfig/src/main/yang/stp/openconfig-spanning-tree-types.yang
rename to models/openconfig/src/main/yang/stp/openconfig-spanning-tree-types@2017-07-14.yang
diff --git a/models/openconfig/src/main/yang/stp/openconfig-spanning-tree.yang b/models/openconfig/src/main/yang/stp/openconfig-spanning-tree@2017-07-14.yang
similarity index 100%
rename from models/openconfig/src/main/yang/stp/openconfig-spanning-tree.yang
rename to models/openconfig/src/main/yang/stp/openconfig-spanning-tree@2017-07-14.yang
diff --git a/models/openconfig/src/main/yang/system/openconfig-aaa-radius.yang b/models/openconfig/src/main/yang/system/openconfig-aaa-radius@2017-07-06.yang
similarity index 100%
rename from models/openconfig/src/main/yang/system/openconfig-aaa-radius.yang
rename to models/openconfig/src/main/yang/system/openconfig-aaa-radius@2017-07-06.yang
diff --git a/models/openconfig/src/main/yang/system/openconfig-aaa-tacacs.yang b/models/openconfig/src/main/yang/system/openconfig-aaa-tacacs@2017-07-06.yang
similarity index 100%
rename from models/openconfig/src/main/yang/system/openconfig-aaa-tacacs.yang
rename to models/openconfig/src/main/yang/system/openconfig-aaa-tacacs@2017-07-06.yang
diff --git a/models/openconfig/src/main/yang/system/openconfig-aaa-types.yang b/models/openconfig/src/main/yang/system/openconfig-aaa-types@2017-07-06.yang
similarity index 100%
rename from models/openconfig/src/main/yang/system/openconfig-aaa-types.yang
rename to models/openconfig/src/main/yang/system/openconfig-aaa-types@2017-07-06.yang
diff --git a/models/openconfig/src/main/yang/system/openconfig-aaa.yang b/models/openconfig/src/main/yang/system/openconfig-aaa@2017-07-06.yang
similarity index 100%
rename from models/openconfig/src/main/yang/system/openconfig-aaa.yang
rename to models/openconfig/src/main/yang/system/openconfig-aaa@2017-07-06.yang
diff --git a/models/openconfig/src/main/yang/system/openconfig-procmon.yang b/models/openconfig/src/main/yang/system/openconfig-procmon@2017-07-06.yang
similarity index 100%
rename from models/openconfig/src/main/yang/system/openconfig-procmon.yang
rename to models/openconfig/src/main/yang/system/openconfig-procmon@2017-07-06.yang
diff --git a/models/openconfig/src/main/yang/system/openconfig-system-logging.yang b/models/openconfig/src/main/yang/system/openconfig-system-logging@2017-07-06.yang
similarity index 100%
rename from models/openconfig/src/main/yang/system/openconfig-system-logging.yang
rename to models/openconfig/src/main/yang/system/openconfig-system-logging@2017-07-06.yang
diff --git a/models/openconfig/src/main/yang/system/openconfig-system-terminal.yang b/models/openconfig/src/main/yang/system/openconfig-system-terminal@2017-07-06.yang
similarity index 100%
rename from models/openconfig/src/main/yang/system/openconfig-system-terminal.yang
rename to models/openconfig/src/main/yang/system/openconfig-system-terminal@2017-07-06.yang
diff --git a/models/openconfig/src/main/yang/system/openconfig-system.yang b/models/openconfig/src/main/yang/system/openconfig-system@2017-07-06.yang
similarity index 100%
rename from models/openconfig/src/main/yang/system/openconfig-system.yang
rename to models/openconfig/src/main/yang/system/openconfig-system@2017-07-06.yang
diff --git a/models/openconfig/src/main/yang/telemetry/openconfig-telemetry-types.yang b/models/openconfig/src/main/yang/telemetry/openconfig-telemetry-types@2017-02-20.yang
similarity index 100%
rename from models/openconfig/src/main/yang/telemetry/openconfig-telemetry-types.yang
rename to models/openconfig/src/main/yang/telemetry/openconfig-telemetry-types@2017-02-20.yang
diff --git a/models/openconfig/src/main/yang/telemetry/openconfig-telemetry.yang b/models/openconfig/src/main/yang/telemetry/openconfig-telemetry@2017-02-20.yang
similarity index 100%
rename from models/openconfig/src/main/yang/telemetry/openconfig-telemetry.yang
rename to models/openconfig/src/main/yang/telemetry/openconfig-telemetry@2017-02-20.yang
diff --git a/models/openconfig/src/main/yang/types/openconfig-inet-types.yang b/models/openconfig/src/main/yang/types/openconfig-inet-types@2017-07-06.yang
similarity index 100%
rename from models/openconfig/src/main/yang/types/openconfig-inet-types.yang
rename to models/openconfig/src/main/yang/types/openconfig-inet-types@2017-07-06.yang
diff --git a/models/openconfig/src/main/yang/types/openconfig-types.yang b/models/openconfig/src/main/yang/types/openconfig-types@2017-08-16.yang
similarity index 100%
rename from models/openconfig/src/main/yang/types/openconfig-types.yang
rename to models/openconfig/src/main/yang/types/openconfig-types@2017-08-16.yang
diff --git a/models/openconfig/src/main/yang/types/openconfig-yang-types.yang b/models/openconfig/src/main/yang/types/openconfig-yang-types@2017-07-30.yang
similarity index 100%
rename from models/openconfig/src/main/yang/types/openconfig-yang-types.yang
rename to models/openconfig/src/main/yang/types/openconfig-yang-types@2017-07-30.yang
diff --git a/models/openconfig/src/main/yang/vlan/openconfig-vlan-types.yang b/models/openconfig/src/main/yang/vlan/openconfig-vlan-types@2017-07-14.yang
similarity index 100%
rename from models/openconfig/src/main/yang/vlan/openconfig-vlan-types.yang
rename to models/openconfig/src/main/yang/vlan/openconfig-vlan-types@2017-07-14.yang
diff --git a/models/openconfig/src/main/yang/vlan/openconfig-vlan.yang b/models/openconfig/src/main/yang/vlan/openconfig-vlan@2017-07-14.yang
similarity index 100%
rename from models/openconfig/src/main/yang/vlan/openconfig-vlan.yang
rename to models/openconfig/src/main/yang/vlan/openconfig-vlan@2017-07-14.yang
diff --git a/models/openroadm/src/main/yang/org-openroadm-common-service-types.yang b/models/openroadm/src/main/yang/org-openroadm-common-service-types@2016-10-14.yang
similarity index 100%
rename from models/openroadm/src/main/yang/org-openroadm-common-service-types.yang
rename to models/openroadm/src/main/yang/org-openroadm-common-service-types@2016-10-14.yang
diff --git a/models/openroadm/src/main/yang/org-openroadm-common-types.yang b/models/openroadm/src/main/yang/org-openroadm-common-types@2016-10-14.yang
similarity index 100%
rename from models/openroadm/src/main/yang/org-openroadm-common-types.yang
rename to models/openroadm/src/main/yang/org-openroadm-common-types@2016-10-14.yang
diff --git a/models/openroadm/src/main/yang/org-openroadm-database.yang b/models/openroadm/src/main/yang/org-openroadm-database@2016-10-14.yang
similarity index 100%
rename from models/openroadm/src/main/yang/org-openroadm-database.yang
rename to models/openroadm/src/main/yang/org-openroadm-database@2016-10-14.yang
diff --git a/models/openroadm/src/main/yang/org-openroadm-de-operations.yang b/models/openroadm/src/main/yang/org-openroadm-de-operations@2016-10-14.yang
similarity index 100%
rename from models/openroadm/src/main/yang/org-openroadm-de-operations.yang
rename to models/openroadm/src/main/yang/org-openroadm-de-operations@2016-10-14.yang
diff --git a/models/openroadm/src/main/yang/org-openroadm-degree.yang b/models/openroadm/src/main/yang/org-openroadm-degree@2016-10-14.yang
similarity index 100%
rename from models/openroadm/src/main/yang/org-openroadm-degree.yang
rename to models/openroadm/src/main/yang/org-openroadm-degree@2016-10-14.yang
diff --git a/models/openroadm/src/main/yang/org-openroadm-device-resource-types.yang b/models/openroadm/src/main/yang/org-openroadm-device-resource-types@2016-10-14.yang
similarity index 100%
rename from models/openroadm/src/main/yang/org-openroadm-device-resource-types.yang
rename to models/openroadm/src/main/yang/org-openroadm-device-resource-types@2016-10-14.yang
diff --git a/models/openroadm/src/main/yang/org-openroadm-device.yang b/models/openroadm/src/main/yang/org-openroadm-device@2017-02-06.yang
similarity index 100%
rename from models/openroadm/src/main/yang/org-openroadm-device.yang
rename to models/openroadm/src/main/yang/org-openroadm-device@2017-02-06.yang
diff --git a/models/openroadm/src/main/yang/org-openroadm-equipment-states-types.yang b/models/openroadm/src/main/yang/org-openroadm-equipment-states-types@2016-10-14.yang
similarity index 100%
rename from models/openroadm/src/main/yang/org-openroadm-equipment-states-types.yang
rename to models/openroadm/src/main/yang/org-openroadm-equipment-states-types@2016-10-14.yang
diff --git a/models/openroadm/src/main/yang/org-openroadm-ethernet-interfaces.yang b/models/openroadm/src/main/yang/org-openroadm-ethernet-interfaces@2016-10-14.yang
similarity index 100%
rename from models/openroadm/src/main/yang/org-openroadm-ethernet-interfaces.yang
rename to models/openroadm/src/main/yang/org-openroadm-ethernet-interfaces@2016-10-14.yang
diff --git a/models/openroadm/src/main/yang/org-openroadm-external-pluggable.yang b/models/openroadm/src/main/yang/org-openroadm-external-pluggable@2016-10-14.yang
similarity index 100%
rename from models/openroadm/src/main/yang/org-openroadm-external-pluggable.yang
rename to models/openroadm/src/main/yang/org-openroadm-external-pluggable@2016-10-14.yang
diff --git a/models/openroadm/src/main/yang/org-openroadm-file-transfer.yang b/models/openroadm/src/main/yang/org-openroadm-file-transfer@2016-10-14.yang
similarity index 100%
rename from models/openroadm/src/main/yang/org-openroadm-file-transfer.yang
rename to models/openroadm/src/main/yang/org-openroadm-file-transfer@2016-10-14.yang
diff --git a/models/openroadm/src/main/yang/org-openroadm-fwdl.yang b/models/openroadm/src/main/yang/org-openroadm-fwdl@2016-10-14.yang
similarity index 100%
rename from models/openroadm/src/main/yang/org-openroadm-fwdl.yang
rename to models/openroadm/src/main/yang/org-openroadm-fwdl@2016-10-14.yang
diff --git a/models/openroadm/src/main/yang/org-openroadm-interfaces.yang b/models/openroadm/src/main/yang/org-openroadm-interfaces@2016-10-14.yang
similarity index 100%
rename from models/openroadm/src/main/yang/org-openroadm-interfaces.yang
rename to models/openroadm/src/main/yang/org-openroadm-interfaces@2016-10-14.yang
diff --git a/models/openroadm/src/main/yang/org-openroadm-lldp.yang b/models/openroadm/src/main/yang/org-openroadm-lldp@2016-10-14.yang
similarity index 100%
rename from models/openroadm/src/main/yang/org-openroadm-lldp.yang
rename to models/openroadm/src/main/yang/org-openroadm-lldp@2016-10-14.yang
diff --git a/models/openroadm/src/main/yang/org-openroadm-maintenance-loopback.yang b/models/openroadm/src/main/yang/org-openroadm-maintenance-loopback@2016-10-14.yang
similarity index 100%
rename from models/openroadm/src/main/yang/org-openroadm-maintenance-loopback.yang
rename to models/openroadm/src/main/yang/org-openroadm-maintenance-loopback@2016-10-14.yang
diff --git a/models/openroadm/src/main/yang/org-openroadm-maintenance-testsignal.yang b/models/openroadm/src/main/yang/org-openroadm-maintenance-testsignal@2016-10-14.yang
similarity index 100%
rename from models/openroadm/src/main/yang/org-openroadm-maintenance-testsignal.yang
rename to models/openroadm/src/main/yang/org-openroadm-maintenance-testsignal@2016-10-14.yang
diff --git a/models/openroadm/src/main/yang/org-openroadm-network.yang b/models/openroadm/src/main/yang/org-openroadm-network@2016-10-14.yang
similarity index 100%
rename from models/openroadm/src/main/yang/org-openroadm-network.yang
rename to models/openroadm/src/main/yang/org-openroadm-network@2016-10-14.yang
diff --git a/models/openroadm/src/main/yang/org-openroadm-optical-channel-interfaces.yang b/models/openroadm/src/main/yang/org-openroadm-optical-channel-interfaces@2016-10-14.yang
similarity index 100%
rename from models/openroadm/src/main/yang/org-openroadm-optical-channel-interfaces.yang
rename to models/openroadm/src/main/yang/org-openroadm-optical-channel-interfaces@2016-10-14.yang
diff --git a/models/openroadm/src/main/yang/org-openroadm-optical-transport-interfaces.yang b/models/openroadm/src/main/yang/org-openroadm-optical-transport-interfaces@2016-10-14.yang
similarity index 100%
rename from models/openroadm/src/main/yang/org-openroadm-optical-transport-interfaces.yang
rename to models/openroadm/src/main/yang/org-openroadm-optical-transport-interfaces@2016-10-14.yang
diff --git a/models/openroadm/src/main/yang/org-openroadm-otn-odu-interfaces.yang b/models/openroadm/src/main/yang/org-openroadm-otn-odu-interfaces@2016-10-14.yang
similarity index 100%
rename from models/openroadm/src/main/yang/org-openroadm-otn-odu-interfaces.yang
rename to models/openroadm/src/main/yang/org-openroadm-otn-odu-interfaces@2016-10-14.yang
diff --git a/models/openroadm/src/main/yang/org-openroadm-otn-otu-interfaces.yang b/models/openroadm/src/main/yang/org-openroadm-otn-otu-interfaces@2016-10-14.yang
similarity index 100%
rename from models/openroadm/src/main/yang/org-openroadm-otn-otu-interfaces.yang
rename to models/openroadm/src/main/yang/org-openroadm-otn-otu-interfaces@2016-10-14.yang
diff --git a/models/openroadm/src/main/yang/org-openroadm-physical-types.yang b/models/openroadm/src/main/yang/org-openroadm-physical-types@2016-10-14.yang
similarity index 100%
rename from models/openroadm/src/main/yang/org-openroadm-physical-types.yang
rename to models/openroadm/src/main/yang/org-openroadm-physical-types@2016-10-14.yang
diff --git a/models/openroadm/src/main/yang/org-openroadm-port-types.yang b/models/openroadm/src/main/yang/org-openroadm-port-types@2016-10-14.yang
similarity index 100%
rename from models/openroadm/src/main/yang/org-openroadm-port-types.yang
rename to models/openroadm/src/main/yang/org-openroadm-port-types@2016-10-14.yang
diff --git a/models/openroadm/src/main/yang/org-openroadm-resource-types.yang b/models/openroadm/src/main/yang/org-openroadm-resource-types@2016-10-14.yang
similarity index 100%
rename from models/openroadm/src/main/yang/org-openroadm-resource-types.yang
rename to models/openroadm/src/main/yang/org-openroadm-resource-types@2016-10-14.yang
diff --git a/models/openroadm/src/main/yang/org-openroadm-resource.yang b/models/openroadm/src/main/yang/org-openroadm-resource@2016-10-14.yang
similarity index 100%
rename from models/openroadm/src/main/yang/org-openroadm-resource.yang
rename to models/openroadm/src/main/yang/org-openroadm-resource@2016-10-14.yang
diff --git a/models/openroadm/src/main/yang/org-openroadm-roadm.yang b/models/openroadm/src/main/yang/org-openroadm-roadm@2016-10-14.yang
similarity index 100%
rename from models/openroadm/src/main/yang/org-openroadm-roadm.yang
rename to models/openroadm/src/main/yang/org-openroadm-roadm@2016-10-14.yang
diff --git a/models/openroadm/src/main/yang/org-openroadm-routing-constraints.yang b/models/openroadm/src/main/yang/org-openroadm-routing-constraints@2016-10-14.yang
similarity index 100%
rename from models/openroadm/src/main/yang/org-openroadm-routing-constraints.yang
rename to models/openroadm/src/main/yang/org-openroadm-routing-constraints@2016-10-14.yang
diff --git a/models/openroadm/src/main/yang/org-openroadm-rstp.yang b/models/openroadm/src/main/yang/org-openroadm-rstp@2016-10-14.yang
similarity index 100%
rename from models/openroadm/src/main/yang/org-openroadm-rstp.yang
rename to models/openroadm/src/main/yang/org-openroadm-rstp@2016-10-14.yang
diff --git a/models/openroadm/src/main/yang/org-openroadm-service.yang b/models/openroadm/src/main/yang/org-openroadm-service@2016-10-14.yang
similarity index 100%
rename from models/openroadm/src/main/yang/org-openroadm-service.yang
rename to models/openroadm/src/main/yang/org-openroadm-service@2016-10-14.yang
diff --git a/models/openroadm/src/main/yang/org-openroadm-srg.yang b/models/openroadm/src/main/yang/org-openroadm-srg@2016-10-14.yang
similarity index 100%
rename from models/openroadm/src/main/yang/org-openroadm-srg.yang
rename to models/openroadm/src/main/yang/org-openroadm-srg@2016-10-14.yang
diff --git a/models/openroadm/src/main/yang/org-openroadm-swdl.yang b/models/openroadm/src/main/yang/org-openroadm-swdl@2016-10-14.yang
similarity index 100%
rename from models/openroadm/src/main/yang/org-openroadm-swdl.yang
rename to models/openroadm/src/main/yang/org-openroadm-swdl@2016-10-14.yang
diff --git a/models/openroadm/src/main/yang/org-openroadm-syslog.yang b/models/openroadm/src/main/yang/org-openroadm-syslog@2016-10-14.yang
similarity index 100%
rename from models/openroadm/src/main/yang/org-openroadm-syslog.yang
rename to models/openroadm/src/main/yang/org-openroadm-syslog@2016-10-14.yang
diff --git a/models/openroadm/src/main/yang/org-openroadm-topology.yang b/models/openroadm/src/main/yang/org-openroadm-topology@2016-10-14.yang
similarity index 100%
rename from models/openroadm/src/main/yang/org-openroadm-topology.yang
rename to models/openroadm/src/main/yang/org-openroadm-topology@2016-10-14.yang
diff --git a/models/openroadm/src/main/yang/org-openroadm-user-mgmt.yang b/models/openroadm/src/main/yang/org-openroadm-user-mgmt@2016-10-14.yang
similarity index 100%
rename from models/openroadm/src/main/yang/org-openroadm-user-mgmt.yang
rename to models/openroadm/src/main/yang/org-openroadm-user-mgmt@2016-10-14.yang
diff --git a/models/openroadm/src/main/yang/org-openroadm-wavelength-map.yang b/models/openroadm/src/main/yang/org-openroadm-wavelength-map@2016-10-14.yang
similarity index 100%
rename from models/openroadm/src/main/yang/org-openroadm-wavelength-map.yang
rename to models/openroadm/src/main/yang/org-openroadm-wavelength-map@2016-10-14.yang
diff --git a/models/openroadm/src/main/yang/org-openroadm-xponder.yang b/models/openroadm/src/main/yang/org-openroadm-xponder@2016-10-14.yang
similarity index 100%
rename from models/openroadm/src/main/yang/org-openroadm-xponder.yang
rename to models/openroadm/src/main/yang/org-openroadm-xponder@2016-10-14.yang
diff --git a/models/polatis/src/main/yang/optical-switch.yang b/models/polatis/src/main/yang/optical-switch@2017-08-04.yang
similarity index 100%
rename from models/polatis/src/main/yang/optical-switch.yang
rename to models/polatis/src/main/yang/optical-switch@2017-08-04.yang
diff --git a/models/polatis/src/main/yang/polatis-switch.yang b/models/polatis/src/main/yang/polatis-switch@2017-05-30.yang
similarity index 100%
rename from models/polatis/src/main/yang/polatis-switch.yang
rename to models/polatis/src/main/yang/polatis-switch@2017-05-30.yang
diff --git a/models/tapi/src/main/yang/tapi-common.yang b/models/tapi/src/main/yang/tapi-common@2017-05-31.yang
similarity index 100%
rename from models/tapi/src/main/yang/tapi-common.yang
rename to models/tapi/src/main/yang/tapi-common@2017-05-31.yang
diff --git a/models/tapi/src/main/yang/tapi-connectivity.yang b/models/tapi/src/main/yang/tapi-connectivity@2017-05-31.yang
similarity index 100%
rename from models/tapi/src/main/yang/tapi-connectivity.yang
rename to models/tapi/src/main/yang/tapi-connectivity@2017-05-31.yang
diff --git a/models/tapi/src/main/yang/tapi-eth.yang b/models/tapi/src/main/yang/tapi-eth@2017-05-31.yang
similarity index 100%
rename from models/tapi/src/main/yang/tapi-eth.yang
rename to models/tapi/src/main/yang/tapi-eth@2017-05-31.yang
diff --git a/models/tapi/src/main/yang/tapi-notification.yang b/models/tapi/src/main/yang/tapi-notification@2017-05-31.yang
similarity index 100%
rename from models/tapi/src/main/yang/tapi-notification.yang
rename to models/tapi/src/main/yang/tapi-notification@2017-05-31.yang
diff --git a/models/tapi/src/main/yang/tapi-oam.yang b/models/tapi/src/main/yang/tapi-oam@2017-05-31.yang
similarity index 100%
rename from models/tapi/src/main/yang/tapi-oam.yang
rename to models/tapi/src/main/yang/tapi-oam@2017-05-31.yang
diff --git a/models/tapi/src/main/yang/tapi-odu.yang b/models/tapi/src/main/yang/tapi-odu@2017-05-31.yang
similarity index 100%
rename from models/tapi/src/main/yang/tapi-odu.yang
rename to models/tapi/src/main/yang/tapi-odu@2017-05-31.yang
diff --git a/models/tapi/src/main/yang/tapi-otsi.yang b/models/tapi/src/main/yang/tapi-otsi@2017-05-31.yang
similarity index 100%
rename from models/tapi/src/main/yang/tapi-otsi.yang
rename to models/tapi/src/main/yang/tapi-otsi@2017-05-31.yang
diff --git a/models/tapi/src/main/yang/tapi-path-computation.yang b/models/tapi/src/main/yang/tapi-path-computation@2017-05-31.yang
similarity index 100%
rename from models/tapi/src/main/yang/tapi-path-computation.yang
rename to models/tapi/src/main/yang/tapi-path-computation@2017-05-31.yang
diff --git a/models/tapi/src/main/yang/tapi-topology.yang b/models/tapi/src/main/yang/tapi-topology@2017-05-31.yang
similarity index 100%
rename from models/tapi/src/main/yang/tapi-topology.yang
rename to models/tapi/src/main/yang/tapi-topology@2017-05-31.yang
diff --git a/models/tapi/src/main/yang/tapi-virtual-network.yang b/models/tapi/src/main/yang/tapi-virtual-network@2017-05-31.yang
similarity index 100%
rename from models/tapi/src/main/yang/tapi-virtual-network.yang
rename to models/tapi/src/main/yang/tapi-virtual-network@2017-05-31.yang