diff --git a/apps/l3vpn/BUCK b/apps/l3vpn/BUCK
index 4e6aaf3..b34eb4c 100644
--- a/apps/l3vpn/BUCK
+++ b/apps/l3vpn/BUCK
@@ -25,17 +25,18 @@
     'org.onosproject.models.l3vpn',
 ]
 
-osgi_jar_with_tests(
-    deps = COMPILE_DEPS,
-    test_deps = TEST_DEPS,
-)
+#Removed until this app builds with onos-yang-tools 2.1
+#osgi_jar_with_tests(
+#    deps = COMPILE_DEPS,
+#    test_deps = TEST_DEPS,
+#)
 
-onos_app(
-    app_name = 'org.onosproject.l3vpn',
-    title = 'YANG L3VPN App',
-    category = 'Traffic Steering',
-    url = 'http://onosproject.org',
-    description = 'L3VPN YANG Application',
-    required_apps = APPS,
-)
+#onos_app(
+#    app_name = 'org.onosproject.l3vpn',
+#    title = 'YANG L3VPN App',
+#    category = 'Traffic Steering',
+#    url = 'http://onosproject.org',
+#    description = 'L3VPN YANG Application',
+#    required_apps = APPS,
+#)
 
diff --git a/apps/openroadm/network/src/main/java/org/onosproject/openroadm/network/OpenRoadmNetworkModelRegistrator.java b/apps/openroadm/network/src/main/java/org/onosproject/openroadm/network/OpenRoadmNetworkModelRegistrator.java
index d7a52b2..b9e5d8e 100644
--- a/apps/openroadm/network/src/main/java/org/onosproject/openroadm/network/OpenRoadmNetworkModelRegistrator.java
+++ b/apps/openroadm/network/src/main/java/org/onosproject/openroadm/network/OpenRoadmNetworkModelRegistrator.java
@@ -18,15 +18,15 @@
 import com.google.common.collect.ImmutableMap;
 import org.apache.felix.scr.annotations.Component;
 import org.onosproject.yang.AbstractYangModelRegistrator;
-import org.onosproject.yang.gen.v1.http.org.openroadm.common.types.rev20161014.OrgOpenroadmCommonTypes;
-import org.onosproject.yang.gen.v1.http.org.openroadm.degree.rev20161014.OrgOpenroadmDegree;
-import org.onosproject.yang.gen.v1.http.org.openroadm.equipment.states.types.rev20161014.OrgOpenroadmEquipmentStatesTypes;
-import org.onosproject.yang.gen.v1.http.org.openroadm.external.pluggable.rev20161014.OrgOpenroadmExternalPluggable;
-import org.onosproject.yang.gen.v1.http.org.openroadm.network.rev20161014.OrgOpenroadmNetwork;
-import org.onosproject.yang.gen.v1.http.org.openroadm.roadm.rev20161014.OrgOpenroadmRoadm;
-import org.onosproject.yang.gen.v1.http.org.openroadm.srg.rev20161014.OrgOpenroadmSrg;
-import org.onosproject.yang.gen.v1.http.org.openroadm.xponder.rev20161014.OrgOpenroadmXponder;
-import org.onosproject.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev20130715.IetfInetTypes;
+import org.onosproject.yang.gen.v1.ietfinettypes.rev20130715.IetfInetTypes;
+import org.onosproject.yang.gen.v1.orgopenroadmcommontypes.rev20161014.OrgOpenroadmCommonTypes;
+import org.onosproject.yang.gen.v1.orgopenroadmdegree.rev20161014.OrgOpenroadmDegree;
+import org.onosproject.yang.gen.v1.orgopenroadmequipmentstatestypes.rev20161014.OrgOpenroadmEquipmentStatesTypes;
+import org.onosproject.yang.gen.v1.orgopenroadmexternalpluggable.rev20161014.OrgOpenroadmExternalPluggable;
+import org.onosproject.yang.gen.v1.orgopenroadmnetwork.rev20161014.OrgOpenroadmNetwork;
+import org.onosproject.yang.gen.v1.orgopenroadmroadm.rev20161014.OrgOpenroadmRoadm;
+import org.onosproject.yang.gen.v1.orgopenroadmsrg.rev20161014.OrgOpenroadmSrg;
+import org.onosproject.yang.gen.v1.orgopenroadmxponder.rev20161014.OrgOpenroadmXponder;
 import org.onosproject.yang.model.DefaultYangModuleId;
 import org.onosproject.yang.model.YangModuleId;
 import org.onosproject.yang.runtime.AppModuleInfo;
diff --git a/apps/openroadm/service/src/main/java/org/onosproject/openroadm/service/OpenRoadmServiceModelRegistrator.java b/apps/openroadm/service/src/main/java/org/onosproject/openroadm/service/OpenRoadmServiceModelRegistrator.java
index f5f68b6..317d980 100644
--- a/apps/openroadm/service/src/main/java/org/onosproject/openroadm/service/OpenRoadmServiceModelRegistrator.java
+++ b/apps/openroadm/service/src/main/java/org/onosproject/openroadm/service/OpenRoadmServiceModelRegistrator.java
@@ -18,15 +18,15 @@
 import com.google.common.collect.ImmutableMap;
 import org.apache.felix.scr.annotations.Component;
 import org.onosproject.yang.AbstractYangModelRegistrator;
-import org.onosproject.yang.gen.v1.http.org.openroadm.common.service.types.rev20161014.OrgOpenroadmCommonServiceTypes;
-import org.onosproject.yang.gen.v1.http.org.openroadm.common.types.rev20161014.OrgOpenroadmCommonTypes;
-import org.onosproject.yang.gen.v1.http.org.openroadm.resource.rev20161014.OrgOpenroadmResource;
-import org.onosproject.yang.gen.v1.http.org.openroadm.resource.types.rev20161014.OrgOpenroadmResourceTypes;
-import org.onosproject.yang.gen.v1.http.org.openroadm.routing.constrains.rev20161014.OrgOpenroadmRoutingConstraints;
-import org.onosproject.yang.gen.v1.http.org.openroadm.service.rev20161014.OrgOpenroadmService;
-import org.onosproject.yang.gen.v1.http.org.openroadm.topology.rev20161014.OrgOpenroadmTopology;
-import org.onosproject.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev20130715.IetfInetTypes;
-import org.onosproject.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev20130715.IetfYangTypes;
+import org.onosproject.yang.gen.v1.ietfinettypes.rev20130715.IetfInetTypes;
+import org.onosproject.yang.gen.v1.ietfyangtypes.rev20130715.IetfYangTypes;
+import org.onosproject.yang.gen.v1.orgopenroadmcommonservicetypes.rev20161014.OrgOpenroadmCommonServiceTypes;
+import org.onosproject.yang.gen.v1.orgopenroadmcommontypes.rev20161014.OrgOpenroadmCommonTypes;
+import org.onosproject.yang.gen.v1.orgopenroadmresource.rev20161014.OrgOpenroadmResource;
+import org.onosproject.yang.gen.v1.orgopenroadmresourcetypes.rev20161014.OrgOpenroadmResourceTypes;
+import org.onosproject.yang.gen.v1.orgopenroadmroutingconstraints.rev20161014.OrgOpenroadmRoutingConstraints;
+import org.onosproject.yang.gen.v1.orgopenroadmservice.rev20161014.OrgOpenroadmService;
+import org.onosproject.yang.gen.v1.orgopenroadmtopology.rev20161014.OrgOpenroadmTopology;
 import org.onosproject.yang.model.DefaultYangModuleId;
 import org.onosproject.yang.model.YangModuleId;
 import org.onosproject.yang.runtime.AppModuleInfo;