Updating Copyright line to Open Networking Foundation
Change-Id: I51d68cf1b4afad48dc2ad587437dc085168a17d3
diff --git a/calendar/features.xml b/calendar/features.xml
index 225bde9..f224f5a 100644
--- a/calendar/features.xml
+++ b/calendar/features.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
- ~ Copyright 2015 Open Networking Laboratory
+ ~ Copyright 2015 Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/calendar/pom.xml b/calendar/pom.xml
index e874947..4214962 100644
--- a/calendar/pom.xml
+++ b/calendar/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright 2014-2016 Open Networking Laboratory
+ ~ Copyright 2014-2016 Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/calendar/src/main/java/org/onosproject/calendar/BandwidthCalendarResource.java b/calendar/src/main/java/org/onosproject/calendar/BandwidthCalendarResource.java
index 5b61ad0..a2eb20a 100644
--- a/calendar/src/main/java/org/onosproject/calendar/BandwidthCalendarResource.java
+++ b/calendar/src/main/java/org/onosproject/calendar/BandwidthCalendarResource.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2014 Open Networking Laboratory
+ * Copyright 2014 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/calendar/src/main/java/org/onosproject/calendar/package-info.java b/calendar/src/main/java/org/onosproject/calendar/package-info.java
index 8cd17a9..b2dd45f 100644
--- a/calendar/src/main/java/org/onosproject/calendar/package-info.java
+++ b/calendar/src/main/java/org/onosproject/calendar/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2014 Open Networking Laboratory
+ * Copyright 2014 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/calendar/src/main/webapp/WEB-INF/web.xml b/calendar/src/main/webapp/WEB-INF/web.xml
index 55777d8..0d48851 100644
--- a/calendar/src/main/webapp/WEB-INF/web.xml
+++ b/calendar/src/main/webapp/WEB-INF/web.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright 2014 Open Networking Laboratory
+ ~ Copyright 2014 Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/carrierethernet/pom.xml b/carrierethernet/pom.xml
index a780440..653d4ca 100644
--- a/carrierethernet/pom.xml
+++ b/carrierethernet/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright 2016 Open Networking Laboratory
+ ~ Copyright 2016 Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-dependencies</artifactId>
- <version>1.10.2</version>
+ <version>1.10.3</version>
<relativePath/><!-- parent is remote -->
</parent>
@@ -32,7 +32,9 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <onos.version>1.10.2</onos.version>
+ <onos.version>1.10.3</onos.version>
+ <!-- TODO onos-build-conf.version can be dropped when onos.version > 1.10.3 -->
+ <onos-build-conf.version>1.10.3-onf</onos-build-conf.version>
<api.version>1.0.0</api.version>
<onos.app.name>org.onosproject.ecord.carrierethernet</onos.app.name>
<onos.app.origin>ON.Lab</onos.app.origin>
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/api/CarrierEthernetPacketNodeService.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/api/CarrierEthernetPacketNodeService.java
index 73438c0..2fdec0c 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/api/CarrierEthernetPacketNodeService.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/api/CarrierEthernetPacketNodeService.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017-present Open Networking Laboratory
+ * Copyright 2017-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/api/CarrierEthernetProvisionerService.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/api/CarrierEthernetProvisionerService.java
index c5144ee..72137c6 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/api/CarrierEthernetProvisionerService.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/api/CarrierEthernetProvisionerService.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017-present Open Networking Laboratory
+ * Copyright 2017-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/api/CarrierEthernetService.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/api/CarrierEthernetService.java
index f147b24..3420228 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/api/CarrierEthernetService.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/api/CarrierEthernetService.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017-present Open Networking Laboratory
+ * Copyright 2017-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/api/package-info.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/api/package-info.java
index 1d2d602..22617c5 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/api/package-info.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/api/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017-present Open Networking Laboratory
+ * Copyright 2017-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetBandwidthProfile.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetBandwidthProfile.java
index d234ea7..bb80d99 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetBandwidthProfile.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetBandwidthProfile.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016 Open Networking Laboratory
+ * Copyright 2016 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetConnection.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetConnection.java
index 2d3acec..9e49b16 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetConnection.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetConnection.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetEnni.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetEnni.java
index 0857918..d7c2c54 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetEnni.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetEnni.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016 Open Networking Laboratory
+ * Copyright 2016 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetEvcUtils.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetEvcUtils.java
index 186b902..0682dcb 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetEvcUtils.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetEvcUtils.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Open Networking Laboratory
+ * Copyright 2017 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetForwardingConstruct.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetForwardingConstruct.java
index 863bde2..8877619 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetForwardingConstruct.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetForwardingConstruct.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016 Open Networking Laboratory
+ * Copyright 2016 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetGenericNi.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetGenericNi.java
index 6352304..cfcd510 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetGenericNi.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetGenericNi.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016 Open Networking Laboratory
+ * Copyright 2016 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetInni.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetInni.java
index bcf9e6b..886130a 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetInni.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetInni.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016 Open Networking Laboratory
+ * Copyright 2016 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetLogicalTerminationPoint.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetLogicalTerminationPoint.java
index 752eccb..b1419c7 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetLogicalTerminationPoint.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetLogicalTerminationPoint.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016 Open Networking Laboratory
+ * Copyright 2016 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetManager.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetManager.java
index bae654a..37e7152 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetManager.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016 Open Networking Laboratory
+ * Copyright 2016 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetMetroConnectivity.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetMetroConnectivity.java
index ab37660..723e338 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetMetroConnectivity.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetMetroConnectivity.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016 Open Networking Laboratory
+ * Copyright 2016 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetNetworkInterface.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetNetworkInterface.java
index 76d8084..e459b41 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetNetworkInterface.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetNetworkInterface.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016 Open Networking Laboratory
+ * Copyright 2016 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetPacketNodeManager.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetPacketNodeManager.java
index 9b50612..2af6ed7 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetPacketNodeManager.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetPacketNodeManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetProvisioner.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetProvisioner.java
index 57423b0..e5ca9c5 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetProvisioner.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetProvisioner.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016 Open Networking Laboratory
+ * Copyright 2016 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetSpanningTreeWeight.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetSpanningTreeWeight.java
index c5f5e4a..689e3a2 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetSpanningTreeWeight.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetSpanningTreeWeight.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetUni.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetUni.java
index a7beec9..b2d8197 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetUni.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetUni.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016 Open Networking Laboratory
+ * Copyright 2016 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetVirtualConnection.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetVirtualConnection.java
index 4203714..c9fd091 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetVirtualConnection.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetVirtualConnection.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016 Open Networking Laboratory
+ * Copyright 2016 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/PortVlanConfig.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/PortVlanConfig.java
index dde224b..fa133b3 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/PortVlanConfig.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/PortVlanConfig.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/package-info.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/package-info.java
index 4b5dc67..4fe8ec2 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/package-info.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016 Open Networking Laboratory
+ * Copyright 2016 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetCreateEvcCommand.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetCreateEvcCommand.java
index d96695b..4aaa040 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetCreateEvcCommand.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetCreateEvcCommand.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetCreateFcCommand.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetCreateFcCommand.java
index 054697c..afcd3b4 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetCreateFcCommand.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetCreateFcCommand.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetCreateLtpCommand.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetCreateLtpCommand.java
index 97cbfec..df91700 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetCreateLtpCommand.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetCreateLtpCommand.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetCreateUniCommand.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetCreateUniCommand.java
index baa20e6..04a7588 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetCreateUniCommand.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetCreateUniCommand.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetEvcFragmentationCommand.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetEvcFragmentationCommand.java
index 780be43..08a3d6f 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetEvcFragmentationCommand.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetEvcFragmentationCommand.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetListEvcsCommand.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetListEvcsCommand.java
index 77f3283..6b8d0f7 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetListEvcsCommand.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetListEvcsCommand.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetListFcsCommand.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetListFcsCommand.java
index bdf04c7..8b5a72c 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetListFcsCommand.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetListFcsCommand.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetListLtpsCommand.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetListLtpsCommand.java
index 7edaed1..5fda80d 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetListLtpsCommand.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetListLtpsCommand.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetListUnisCommand.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetListUnisCommand.java
index 39084a7..6032278 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetListUnisCommand.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetListUnisCommand.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetPktOpticalTopoCommand.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetPktOpticalTopoCommand.java
index 6c82bed..e066048 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetPktOpticalTopoCommand.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetPktOpticalTopoCommand.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetRemoveAllEvcsCommand.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetRemoveAllEvcsCommand.java
index d1c623e..d641e58 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetRemoveAllEvcsCommand.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetRemoveAllEvcsCommand.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetRemoveAllFcsCommand.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetRemoveAllFcsCommand.java
index 8faf980..c873924 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetRemoveAllFcsCommand.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetRemoveAllFcsCommand.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetRemoveEvcCommand.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetRemoveEvcCommand.java
index 144d92e..ae0bdac 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetRemoveEvcCommand.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetRemoveEvcCommand.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetRemoveFcCommand.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetRemoveFcCommand.java
index f134f6a..be54ba1 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetRemoveFcCommand.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetRemoveFcCommand.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetRemoveLtpCommand.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetRemoveLtpCommand.java
index 475d9ad..a8519d7 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetRemoveLtpCommand.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetRemoveLtpCommand.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetRemoveUniCommand.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetRemoveUniCommand.java
index a14747b..ba1fddd 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetRemoveUniCommand.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetRemoveUniCommand.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/package-info.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/package-info.java
index b5a81b3..f360b4c 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/package-info.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/CarrierEthernetBooleanCompleter.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/CarrierEthernetBooleanCompleter.java
index f64c866..fdae501 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/CarrierEthernetBooleanCompleter.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/CarrierEthernetBooleanCompleter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/CarrierEthernetConnectPointCompleter.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/CarrierEthernetConnectPointCompleter.java
index 7eb4447..e892ca9 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/CarrierEthernetConnectPointCompleter.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/CarrierEthernetConnectPointCompleter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/CarrierEthernetEvcCompleter.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/CarrierEthernetEvcCompleter.java
index abf678e..4c566ac 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/CarrierEthernetEvcCompleter.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/CarrierEthernetEvcCompleter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/CarrierEthernetEvcTypeCompleter.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/CarrierEthernetEvcTypeCompleter.java
index 79da333..2a564c6 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/CarrierEthernetEvcTypeCompleter.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/CarrierEthernetEvcTypeCompleter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/CarrierEthernetFcCompleter.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/CarrierEthernetFcCompleter.java
index 7da86e1..8013e17 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/CarrierEthernetFcCompleter.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/CarrierEthernetFcCompleter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/CarrierEthernetLtpCompleter.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/CarrierEthernetLtpCompleter.java
index a1ffd47..2b9d7c5 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/CarrierEthernetLtpCompleter.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/CarrierEthernetLtpCompleter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/CarrierEthernetLtpTypeCompleter.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/CarrierEthernetLtpTypeCompleter.java
index 964d8ce..5aac443 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/CarrierEthernetLtpTypeCompleter.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/CarrierEthernetLtpTypeCompleter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/CarrierEthernetPotentialLtpCompleter.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/CarrierEthernetPotentialLtpCompleter.java
index 18fb49a..007de33 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/CarrierEthernetPotentialLtpCompleter.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/CarrierEthernetPotentialLtpCompleter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/CarrierEthernetPotentialUniCompleter.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/CarrierEthernetPotentialUniCompleter.java
index e4a5dd3..6c9b378 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/CarrierEthernetPotentialUniCompleter.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/CarrierEthernetPotentialUniCompleter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/CarrierEthernetUniCompleter.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/CarrierEthernetUniCompleter.java
index 1d019b9..a620472 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/CarrierEthernetUniCompleter.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/CarrierEthernetUniCompleter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/CarrierEthernetValidLtpCompleter.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/CarrierEthernetValidLtpCompleter.java
index 6233972..d0efabb 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/CarrierEthernetValidLtpCompleter.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/CarrierEthernetValidLtpCompleter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/CarrierEthernetValidUniCompleter.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/CarrierEthernetValidUniCompleter.java
index 24a6543..c8e5656 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/CarrierEthernetValidUniCompleter.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/CarrierEthernetValidUniCompleter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/UniqueStringsCompleter.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/UniqueStringsCompleter.java
index 97f9d3d..ba401ee 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/UniqueStringsCompleter.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/UniqueStringsCompleter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/package-info.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/package-info.java
index 5ceee89..7eda750 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/package-info.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/completers/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/package-info.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/package-info.java
index 61562c5..3a593b7 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/package-info.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/rest/CarrierEthernetWebApplication.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/rest/CarrierEthernetWebApplication.java
index a56dba1..e13fff5 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/rest/CarrierEthernetWebApplication.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/rest/CarrierEthernetWebApplication.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017-present Open Networking Laboratory
+ * Copyright 2017-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/rest/CarrierEthernetWebResource.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/rest/CarrierEthernetWebResource.java
index c6a06ca..710e488 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/rest/CarrierEthernetWebResource.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/rest/CarrierEthernetWebResource.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017-present Open Networking Laboratory
+ * Copyright 2017-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/rest/EvcCodec.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/rest/EvcCodec.java
index ac8af69..a433a2d 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/rest/EvcCodec.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/rest/EvcCodec.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017-present Open Networking Laboratory
+ * Copyright 2017-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/rest/EvcCodecRegistrator.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/rest/EvcCodecRegistrator.java
index df833da..4ddf92a 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/rest/EvcCodecRegistrator.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/rest/EvcCodecRegistrator.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017-present Open Networking Laboratory
+ * Copyright 2017-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/rest/package-info.java b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/rest/package-info.java
index 400df6e..31fd2b4 100644
--- a/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/rest/package-info.java
+++ b/carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/rest/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/resources/OSGI-INF/blueprint/shell-config.xml b/carrierethernet/src/main/resources/OSGI-INF/blueprint/shell-config.xml
index 3a35f08..f61a56a 100644
--- a/carrierethernet/src/main/resources/OSGI-INF/blueprint/shell-config.xml
+++ b/carrierethernet/src/main/resources/OSGI-INF/blueprint/shell-config.xml
@@ -1,5 +1,5 @@
<!--
- ~ Copyright 2016-present Open Networking Laboratory
+ ~ Copyright 2016-present Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/carrierethernet/src/main/webapp/WEB-INF/web.xml b/carrierethernet/src/main/webapp/WEB-INF/web.xml
index 5774d22..3cd10c8 100644
--- a/carrierethernet/src/main/webapp/WEB-INF/web.xml
+++ b/carrierethernet/src/main/webapp/WEB-INF/web.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright 2017-present Open Networking Laboratory
+ ~ Copyright 2017-present Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/database-perf/pom.xml b/database-perf/pom.xml
index 11807f7..888723c 100644
--- a/database-perf/pom.xml
+++ b/database-perf/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright 2015-2016 Open Networking Laboratory
+ ~ Copyright 2015-2016 Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/database-perf/src/main/java/org/onosproject/databaseperf/DatabasePerfInstaller.java b/database-perf/src/main/java/org/onosproject/databaseperf/DatabasePerfInstaller.java
index 771e156..f413d86 100644
--- a/database-perf/src/main/java/org/onosproject/databaseperf/DatabasePerfInstaller.java
+++ b/database-perf/src/main/java/org/onosproject/databaseperf/DatabasePerfInstaller.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/database-perf/src/main/java/org/onosproject/databaseperf/package-info.java b/database-perf/src/main/java/org/onosproject/databaseperf/package-info.java
index d63f9f8..2441b1d 100644
--- a/database-perf/src/main/java/org/onosproject/databaseperf/package-info.java
+++ b/database-perf/src/main/java/org/onosproject/databaseperf/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ecord/co/features.xml b/ecord/co/features.xml
index c68a07b..62493a2 100644
--- a/ecord/co/features.xml
+++ b/ecord/co/features.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
- ~ Copyright 2015 Open Networking Laboratory
+ ~ Copyright 2015 Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/ecord/co/pom.xml b/ecord/co/pom.xml
index a75f068..c0f97c2 100644
--- a/ecord/co/pom.xml
+++ b/ecord/co/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright 2015-2016 Open Networking Laboratory
+ ~ Copyright 2015-2016 Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/ecord/co/src/main/java/org/onosproject/ecord/co/BigSwitch.java b/ecord/co/src/main/java/org/onosproject/ecord/co/BigSwitch.java
index 7d6c0ab..4209ef1 100644
--- a/ecord/co/src/main/java/org/onosproject/ecord/co/BigSwitch.java
+++ b/ecord/co/src/main/java/org/onosproject/ecord/co/BigSwitch.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ecord/co/src/main/java/org/onosproject/ecord/co/BigSwitchDeviceProvider.java b/ecord/co/src/main/java/org/onosproject/ecord/co/BigSwitchDeviceProvider.java
index da27b3a..1ed8a8d 100644
--- a/ecord/co/src/main/java/org/onosproject/ecord/co/BigSwitchDeviceProvider.java
+++ b/ecord/co/src/main/java/org/onosproject/ecord/co/BigSwitchDeviceProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ecord/co/src/main/java/org/onosproject/ecord/co/BigSwitchEvent.java b/ecord/co/src/main/java/org/onosproject/ecord/co/BigSwitchEvent.java
index 2c50dcd..793267d 100644
--- a/ecord/co/src/main/java/org/onosproject/ecord/co/BigSwitchEvent.java
+++ b/ecord/co/src/main/java/org/onosproject/ecord/co/BigSwitchEvent.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ecord/co/src/main/java/org/onosproject/ecord/co/BigSwitchListener.java b/ecord/co/src/main/java/org/onosproject/ecord/co/BigSwitchListener.java
index bd8c64c..21049e5 100644
--- a/ecord/co/src/main/java/org/onosproject/ecord/co/BigSwitchListener.java
+++ b/ecord/co/src/main/java/org/onosproject/ecord/co/BigSwitchListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ecord/co/src/main/java/org/onosproject/ecord/co/BigSwitchManager.java b/ecord/co/src/main/java/org/onosproject/ecord/co/BigSwitchManager.java
index b3d07b9..75bdc28 100644
--- a/ecord/co/src/main/java/org/onosproject/ecord/co/BigSwitchManager.java
+++ b/ecord/co/src/main/java/org/onosproject/ecord/co/BigSwitchManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ecord/co/src/main/java/org/onosproject/ecord/co/BigSwitchService.java b/ecord/co/src/main/java/org/onosproject/ecord/co/BigSwitchService.java
index 291f238..f431a40 100644
--- a/ecord/co/src/main/java/org/onosproject/ecord/co/BigSwitchService.java
+++ b/ecord/co/src/main/java/org/onosproject/ecord/co/BigSwitchService.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ecord/co/src/main/java/org/onosproject/ecord/co/CentralOffice.java b/ecord/co/src/main/java/org/onosproject/ecord/co/CentralOffice.java
index 0d1714a..f84b273 100644
--- a/ecord/co/src/main/java/org/onosproject/ecord/co/CentralOffice.java
+++ b/ecord/co/src/main/java/org/onosproject/ecord/co/CentralOffice.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ecord/co/src/main/java/org/onosproject/ecord/co/CrossConnectConfig.java b/ecord/co/src/main/java/org/onosproject/ecord/co/CrossConnectConfig.java
index fb76cea..e904a77 100644
--- a/ecord/co/src/main/java/org/onosproject/ecord/co/CrossConnectConfig.java
+++ b/ecord/co/src/main/java/org/onosproject/ecord/co/CrossConnectConfig.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ecord/co/src/main/java/org/onosproject/ecord/co/package-info.java b/ecord/co/src/main/java/org/onosproject/ecord/co/package-info.java
index e0c21f1..1e44493 100644
--- a/ecord/co/src/main/java/org/onosproject/ecord/co/package-info.java
+++ b/ecord/co/src/main/java/org/onosproject/ecord/co/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/flowtest/pom.xml b/flowtest/pom.xml
index c320f16..d4242ba 100644
--- a/flowtest/pom.xml
+++ b/flowtest/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright 2015-2016 Open Networking Laboratory
+ ~ Copyright 2015-2016 Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/flowtest/src/main/java/org/onosproject/flowruletest/dispatch/package-info.java b/flowtest/src/main/java/org/onosproject/flowruletest/dispatch/package-info.java
index 329140a..6db9b8c 100644
--- a/flowtest/src/main/java/org/onosproject/flowruletest/dispatch/package-info.java
+++ b/flowtest/src/main/java/org/onosproject/flowruletest/dispatch/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2014-2015 Open Networking Laboratory
+ * Copyright 2014-2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/flowtest/src/main/java/org/onosproject/flowruletest/impl/package-info.java b/flowtest/src/main/java/org/onosproject/flowruletest/impl/package-info.java
index 2ecb23d..95d2fcf 100644
--- a/flowtest/src/main/java/org/onosproject/flowruletest/impl/package-info.java
+++ b/flowtest/src/main/java/org/onosproject/flowruletest/impl/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2014-2015 Open Networking Laboratory
+ * Copyright 2014-2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/flowtest/src/main/java/org/onosproject/flowruletest/package-info.java b/flowtest/src/main/java/org/onosproject/flowruletest/package-info.java
index ea0207b..95ec5c2 100644
--- a/flowtest/src/main/java/org/onosproject/flowruletest/package-info.java
+++ b/flowtest/src/main/java/org/onosproject/flowruletest/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2014-2015 Open Networking Laboratory
+ * Copyright 2014-2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/flowtest/src/main/resource/org/onosproject/flowrule/resource/package-info.java b/flowtest/src/main/resource/org/onosproject/flowrule/resource/package-info.java
index a1918c8..f1b08ac 100644
--- a/flowtest/src/main/resource/org/onosproject/flowrule/resource/package-info.java
+++ b/flowtest/src/main/resource/org/onosproject/flowrule/resource/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2014-2015 Open Networking Laboratory
+ * Copyright 2014-2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/group-fwd/pom.xml b/group-fwd/pom.xml
index d7410b1..ec7c6ff 100644
--- a/group-fwd/pom.xml
+++ b/group-fwd/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright 2017 Open Networking Laboratory
+ ~ Copyright 2017 Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/group-fwd/src/main/java/org/onosproject/groupfwd/GroupForwarding.java b/group-fwd/src/main/java/org/onosproject/groupfwd/GroupForwarding.java
index 61375d7..a68d04d 100644
--- a/group-fwd/src/main/java/org/onosproject/groupfwd/GroupForwarding.java
+++ b/group-fwd/src/main/java/org/onosproject/groupfwd/GroupForwarding.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Open Networking Laboratory
+ * Copyright 2017 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/group-fwd/src/main/java/org/onosproject/groupfwd/package-info.java b/group-fwd/src/main/java/org/onosproject/groupfwd/package-info.java
index 6874894..69dff69 100644
--- a/group-fwd/src/main/java/org/onosproject/groupfwd/package-info.java
+++ b/group-fwd/src/main/java/org/onosproject/groupfwd/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Open Networking Laboratory
+ * Copyright 2017 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/app/app.xml b/icona/app/app.xml
index 8fb0322..6180590 100644
--- a/icona/app/app.xml
+++ b/icona/app/app.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright 2016-present Open Networking Laboratory
+ ~ Copyright 2016-present Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/icona/app/features.xml b/icona/app/features.xml
index 74fa9c8..708d1e0 100644
--- a/icona/app/features.xml
+++ b/icona/app/features.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
- ~ Copyright 2016-present Open Networking Laboratory
+ ~ Copyright 2016-present Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/icona/app/pom.xml b/icona/app/pom.xml
index a4d576c..f0ed721 100644
--- a/icona/app/pom.xml
+++ b/icona/app/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright 2016-present Open Networking Laboratory
+ ~ Copyright 2016-present Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/icona/domainmgr/pom.xml b/icona/domainmgr/pom.xml
index 57954e3..b44cfee 100644
--- a/icona/domainmgr/pom.xml
+++ b/icona/domainmgr/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright 2016-present Open Networking Laboratory
+ ~ Copyright 2016-present Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/api/DomainConfigService.java b/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/api/DomainConfigService.java
index 81057a4..5531b61 100644
--- a/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/api/DomainConfigService.java
+++ b/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/api/DomainConfigService.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/api/DomainEvent.java b/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/api/DomainEvent.java
index 0ac8358..3a86e53 100644
--- a/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/api/DomainEvent.java
+++ b/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/api/DomainEvent.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/api/DomainId.java b/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/api/DomainId.java
index e031952..da2b2e0 100644
--- a/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/api/DomainId.java
+++ b/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/api/DomainId.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/api/DomainListener.java b/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/api/DomainListener.java
index 6094ff8..b6107cc 100644
--- a/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/api/DomainListener.java
+++ b/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/api/DomainListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/api/DomainService.java b/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/api/DomainService.java
index 6f3597a..34a9804 100644
--- a/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/api/DomainService.java
+++ b/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/api/DomainService.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/api/DomainStore.java b/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/api/DomainStore.java
index 6374430..69db90d 100644
--- a/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/api/DomainStore.java
+++ b/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/api/DomainStore.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/api/DomainStoreDelegate.java b/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/api/DomainStoreDelegate.java
index edb7d9a..1d9bfd2 100644
--- a/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/api/DomainStoreDelegate.java
+++ b/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/api/DomainStoreDelegate.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/api/LinkId.java b/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/api/LinkId.java
index 37dc510..40f5c9c 100644
--- a/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/api/LinkId.java
+++ b/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/api/LinkId.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/api/package-info.java b/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/api/package-info.java
index 16c0b74..b3fc18c 100644
--- a/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/api/package-info.java
+++ b/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/api/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/impl/DistributedDomainStore.java b/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/impl/DistributedDomainStore.java
index 4ff3557..5125e33 100644
--- a/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/impl/DistributedDomainStore.java
+++ b/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/impl/DistributedDomainStore.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/impl/DomainConfigManager.java b/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/impl/DomainConfigManager.java
index a114960..7d8e9c0 100644
--- a/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/impl/DomainConfigManager.java
+++ b/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/impl/DomainConfigManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/impl/DomainManager.java b/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/impl/DomainManager.java
index 4b6682b..97b6172 100644
--- a/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/impl/DomainManager.java
+++ b/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/impl/DomainManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/impl/config/DomainConfig.java b/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/impl/config/DomainConfig.java
index 4364ec0..7227838 100644
--- a/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/impl/config/DomainConfig.java
+++ b/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/impl/config/DomainConfig.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/impl/package-info.java b/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/impl/package-info.java
index 5f9144e..9e90384 100644
--- a/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/impl/package-info.java
+++ b/icona/domainmgr/src/main/java/org/onosproject/icona/domainmgr/impl/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/domainprovider/pom.xml b/icona/domainprovider/pom.xml
index a8f30ba..32d934e 100644
--- a/icona/domainprovider/pom.xml
+++ b/icona/domainprovider/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright 2016-present Open Networking Laboratory
+ ~ Copyright 2016-present Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/DefaultDomainTopology.java b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/DefaultDomainTopology.java
index 511928d..b8832d2 100644
--- a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/DefaultDomainTopology.java
+++ b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/DefaultDomainTopology.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/DomainElement.java b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/DomainElement.java
index 4ef9c67..a121304 100644
--- a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/DomainElement.java
+++ b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/DomainElement.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/DomainTopology.java b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/DomainTopology.java
index 1d9f98b..d8bb2b3 100644
--- a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/DomainTopology.java
+++ b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/DomainTopology.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/IconaSBListener.java b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/IconaSBListener.java
index 079642d..018efdc 100644
--- a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/IconaSBListener.java
+++ b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/IconaSBListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/IconaSBListenerService.java b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/IconaSBListenerService.java
index fc06fea..2bfac27 100644
--- a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/IconaSBListenerService.java
+++ b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/IconaSBListenerService.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/IconaSBTopologyListener.java b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/IconaSBTopologyListener.java
index 58267cf..f7e75b7 100644
--- a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/IconaSBTopologyListener.java
+++ b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/IconaSBTopologyListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/device/DefaultDomainDevice.java b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/device/DefaultDomainDevice.java
index 88ff89b..0dbab95 100644
--- a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/device/DefaultDomainDevice.java
+++ b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/device/DefaultDomainDevice.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/device/DomainDevice.java b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/device/DomainDevice.java
index b5dc0df..2f3a2df 100644
--- a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/device/DomainDevice.java
+++ b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/device/DomainDevice.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/device/IconaSBDeviceListener.java b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/device/IconaSBDeviceListener.java
index 9b7b4d0..72d2be1 100644
--- a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/device/IconaSBDeviceListener.java
+++ b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/device/IconaSBDeviceListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/device/IconaSBDeviceService.java b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/device/IconaSBDeviceService.java
index 664331a..b0a0f1c 100644
--- a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/device/IconaSBDeviceService.java
+++ b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/device/IconaSBDeviceService.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/device/package-info.java b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/device/package-info.java
index b04b14c..87bc795 100644
--- a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/device/package-info.java
+++ b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/device/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/flow/package-info.java b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/flow/package-info.java
index 6ffc368..56b727f 100644
--- a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/flow/package-info.java
+++ b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/flow/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/host/DefaultDomainHostDescription.java b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/host/DefaultDomainHostDescription.java
index f8f2d22..16fbf49 100644
--- a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/host/DefaultDomainHostDescription.java
+++ b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/host/DefaultDomainHostDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/host/DomainHostDescription.java b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/host/DomainHostDescription.java
index 658d4ee..1aabe1b 100644
--- a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/host/DomainHostDescription.java
+++ b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/host/DomainHostDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/host/IconaSBHostListener.java b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/host/IconaSBHostListener.java
index a4b4292..7b4360d 100644
--- a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/host/IconaSBHostListener.java
+++ b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/host/IconaSBHostListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/host/IconaSBHostService.java b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/host/IconaSBHostService.java
index fc34af4..475d3a1 100644
--- a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/host/IconaSBHostService.java
+++ b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/host/IconaSBHostService.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/host/package-info.java b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/host/package-info.java
index 50e88a1..df7fb30 100644
--- a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/host/package-info.java
+++ b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/host/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/link/DefaultInterLinkDescription.java b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/link/DefaultInterLinkDescription.java
index 3f5456f..3b9b578 100644
--- a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/link/DefaultInterLinkDescription.java
+++ b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/link/DefaultInterLinkDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/link/DefaultIntraLinkDescription.java b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/link/DefaultIntraLinkDescription.java
index f647427..7376c04 100644
--- a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/link/DefaultIntraLinkDescription.java
+++ b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/link/DefaultIntraLinkDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/link/IconaSBLinkListener.java b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/link/IconaSBLinkListener.java
index f51daed..f2d6266 100644
--- a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/link/IconaSBLinkListener.java
+++ b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/link/IconaSBLinkListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/link/IconaSBLinkService.java b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/link/IconaSBLinkService.java
index 3191413..9aa200a 100644
--- a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/link/IconaSBLinkService.java
+++ b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/link/IconaSBLinkService.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/link/InterLinkDescription.java b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/link/InterLinkDescription.java
index 21de42d..0e507ce 100644
--- a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/link/InterLinkDescription.java
+++ b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/link/InterLinkDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/link/IntraLinkDescription.java b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/link/IntraLinkDescription.java
index cc9e3d7..c2a1384 100644
--- a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/link/IntraLinkDescription.java
+++ b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/link/IntraLinkDescription.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/link/package-info.java b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/link/package-info.java
index 8458e95..53d0013 100644
--- a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/link/package-info.java
+++ b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/link/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/package-info.java b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/package-info.java
index 8fc209f..d77dbf3 100644
--- a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/package-info.java
+++ b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/api/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/impl/config/IconaConfig.java b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/impl/config/IconaConfig.java
index 59a503e..aad5fcd 100644
--- a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/impl/config/IconaConfig.java
+++ b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/impl/config/IconaConfig.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/impl/config/TopologyConfig.java b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/impl/config/TopologyConfig.java
index 31f4274..fed2931 100644
--- a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/impl/config/TopologyConfig.java
+++ b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/impl/config/TopologyConfig.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/impl/config/package-info.java b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/impl/config/package-info.java
index 6d8ec1c..49d352f 100644
--- a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/impl/config/package-info.java
+++ b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/impl/config/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/impl/flow/package-info.java b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/impl/flow/package-info.java
index 006919d..a1399ab 100644
--- a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/impl/flow/package-info.java
+++ b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/impl/flow/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/impl/package-info.java b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/impl/package-info.java
index 693c2ec..481816b 100644
--- a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/impl/package-info.java
+++ b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/impl/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/impl/topology/IconaRemoteDeviceProvider.java b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/impl/topology/IconaRemoteDeviceProvider.java
index 5a2a60d..efa9f77 100644
--- a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/impl/topology/IconaRemoteDeviceProvider.java
+++ b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/impl/topology/IconaRemoteDeviceProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/impl/topology/IconaRemoteHostProvider.java b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/impl/topology/IconaRemoteHostProvider.java
index dc55a38..4199723 100644
--- a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/impl/topology/IconaRemoteHostProvider.java
+++ b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/impl/topology/IconaRemoteHostProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/impl/topology/IconaRemoteLinkProvider.java b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/impl/topology/IconaRemoteLinkProvider.java
index e1cb7ba..a2258b6 100644
--- a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/impl/topology/IconaRemoteLinkProvider.java
+++ b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/impl/topology/IconaRemoteLinkProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/impl/topology/IconaTopologyManager.java b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/impl/topology/IconaTopologyManager.java
index 1e0ba5a..2251b1d 100644
--- a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/impl/topology/IconaTopologyManager.java
+++ b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/impl/topology/IconaTopologyManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/impl/topology/package-info.java b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/impl/topology/package-info.java
index 61127ce..a3df034 100644
--- a/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/impl/topology/package-info.java
+++ b/icona/domainprovider/src/main/java/org/onosproject/icona/domainprovider/impl/topology/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/icona/pom.xml b/icona/pom.xml
index b75b0ef..17096b5 100644
--- a/icona/pom.xml
+++ b/icona/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright 2016-present Open Networking Laboratory
+ ~ Copyright 2016-present Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/ifwd/pom.xml b/ifwd/pom.xml
index b895956..d710b60 100644
--- a/ifwd/pom.xml
+++ b/ifwd/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright 2014-2016 Open Networking Laboratory
+ ~ Copyright 2014-2016 Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/ifwd/src/main/java/org/onosproject/ifwd/IntentReactiveForwarding.java b/ifwd/src/main/java/org/onosproject/ifwd/IntentReactiveForwarding.java
index 8f4c980..14ed180 100644
--- a/ifwd/src/main/java/org/onosproject/ifwd/IntentReactiveForwarding.java
+++ b/ifwd/src/main/java/org/onosproject/ifwd/IntentReactiveForwarding.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2014 Open Networking Laboratory
+ * Copyright 2014 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ifwd/src/main/java/org/onosproject/ifwd/package-info.java b/ifwd/src/main/java/org/onosproject/ifwd/package-info.java
index f074606..8827ad6 100644
--- a/ifwd/src/main/java/org/onosproject/ifwd/package-info.java
+++ b/ifwd/src/main/java/org/onosproject/ifwd/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2014 Open Networking Laboratory
+ * Copyright 2014 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ipfix/pom.xml b/ipfix/pom.xml
index 64bda6a..8b0848e 100644
--- a/ipfix/pom.xml
+++ b/ipfix/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright 2014-2016 Open Networking Laboratory
+ ~ Copyright 2014-2016 Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/ipfix/src/main/java/org/onosproject/ipfix/DataRecordPortStatsIn.java b/ipfix/src/main/java/org/onosproject/ipfix/DataRecordPortStatsIn.java
index 32341ac..35917e4 100644
--- a/ipfix/src/main/java/org/onosproject/ipfix/DataRecordPortStatsIn.java
+++ b/ipfix/src/main/java/org/onosproject/ipfix/DataRecordPortStatsIn.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ipfix/src/main/java/org/onosproject/ipfix/DataRecordPortStatsOut.java b/ipfix/src/main/java/org/onosproject/ipfix/DataRecordPortStatsOut.java
index 74f6a78..43a5645 100644
--- a/ipfix/src/main/java/org/onosproject/ipfix/DataRecordPortStatsOut.java
+++ b/ipfix/src/main/java/org/onosproject/ipfix/DataRecordPortStatsOut.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ipfix/src/main/java/org/onosproject/ipfix/DataRecordRfwdIpv4.java b/ipfix/src/main/java/org/onosproject/ipfix/DataRecordRfwdIpv4.java
index 266bd8c..968dc36 100644
--- a/ipfix/src/main/java/org/onosproject/ipfix/DataRecordRfwdIpv4.java
+++ b/ipfix/src/main/java/org/onosproject/ipfix/DataRecordRfwdIpv4.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ipfix/src/main/java/org/onosproject/ipfix/DataRecordRfwdIpv6.java b/ipfix/src/main/java/org/onosproject/ipfix/DataRecordRfwdIpv6.java
index a916f78..61ba16e 100644
--- a/ipfix/src/main/java/org/onosproject/ipfix/DataRecordRfwdIpv6.java
+++ b/ipfix/src/main/java/org/onosproject/ipfix/DataRecordRfwdIpv6.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ipfix/src/main/java/org/onosproject/ipfix/DataRecordRfwdMac.java b/ipfix/src/main/java/org/onosproject/ipfix/DataRecordRfwdMac.java
index 9598829..ed4f376 100644
--- a/ipfix/src/main/java/org/onosproject/ipfix/DataRecordRfwdMac.java
+++ b/ipfix/src/main/java/org/onosproject/ipfix/DataRecordRfwdMac.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ipfix/src/main/java/org/onosproject/ipfix/FlowRemovedListener.java b/ipfix/src/main/java/org/onosproject/ipfix/FlowRemovedListener.java
index 3cab6a0..00ac97c 100644
--- a/ipfix/src/main/java/org/onosproject/ipfix/FlowRemovedListener.java
+++ b/ipfix/src/main/java/org/onosproject/ipfix/FlowRemovedListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ipfix/src/main/java/org/onosproject/ipfix/IpfixManager.java b/ipfix/src/main/java/org/onosproject/ipfix/IpfixManager.java
index a1a2be0..1a4d90a 100644
--- a/ipfix/src/main/java/org/onosproject/ipfix/IpfixManager.java
+++ b/ipfix/src/main/java/org/onosproject/ipfix/IpfixManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ipfix/src/main/java/org/onosproject/ipfix/IpfixSender.java b/ipfix/src/main/java/org/onosproject/ipfix/IpfixSender.java
index 3d4a05a..5ad18b2 100644
--- a/ipfix/src/main/java/org/onosproject/ipfix/IpfixSender.java
+++ b/ipfix/src/main/java/org/onosproject/ipfix/IpfixSender.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ipfix/src/main/java/org/onosproject/ipfix/PortStatsListener.java b/ipfix/src/main/java/org/onosproject/ipfix/PortStatsListener.java
index 87e78b2..e99d18f 100644
--- a/ipfix/src/main/java/org/onosproject/ipfix/PortStatsListener.java
+++ b/ipfix/src/main/java/org/onosproject/ipfix/PortStatsListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ipfix/src/main/java/org/onosproject/ipfix/package-info.java b/ipfix/src/main/java/org/onosproject/ipfix/package-info.java
index e2d8146..c965a0a 100644
--- a/ipfix/src/main/java/org/onosproject/ipfix/package-info.java
+++ b/ipfix/src/main/java/org/onosproject/ipfix/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ipfix/src/main/java/org/onosproject/ipfix/packet/AbstractIpfixPacketEntity.java b/ipfix/src/main/java/org/onosproject/ipfix/packet/AbstractIpfixPacketEntity.java
index 8c5413f..7ad9fda 100644
--- a/ipfix/src/main/java/org/onosproject/ipfix/packet/AbstractIpfixPacketEntity.java
+++ b/ipfix/src/main/java/org/onosproject/ipfix/packet/AbstractIpfixPacketEntity.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ipfix/src/main/java/org/onosproject/ipfix/packet/AbstractIpfixPacketInterface.java b/ipfix/src/main/java/org/onosproject/ipfix/packet/AbstractIpfixPacketInterface.java
index cec3bbe..73434d8 100644
--- a/ipfix/src/main/java/org/onosproject/ipfix/packet/AbstractIpfixPacketInterface.java
+++ b/ipfix/src/main/java/org/onosproject/ipfix/packet/AbstractIpfixPacketInterface.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ipfix/src/main/java/org/onosproject/ipfix/packet/DataRecord.java b/ipfix/src/main/java/org/onosproject/ipfix/packet/DataRecord.java
index 37b65b0..0f09ec4 100644
--- a/ipfix/src/main/java/org/onosproject/ipfix/packet/DataRecord.java
+++ b/ipfix/src/main/java/org/onosproject/ipfix/packet/DataRecord.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ipfix/src/main/java/org/onosproject/ipfix/packet/HeaderException.java b/ipfix/src/main/java/org/onosproject/ipfix/packet/HeaderException.java
index 504fd40..ddaa8f9 100644
--- a/ipfix/src/main/java/org/onosproject/ipfix/packet/HeaderException.java
+++ b/ipfix/src/main/java/org/onosproject/ipfix/packet/HeaderException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ipfix/src/main/java/org/onosproject/ipfix/packet/Ie.java b/ipfix/src/main/java/org/onosproject/ipfix/packet/Ie.java
index 494a810..aa33c7a 100644
--- a/ipfix/src/main/java/org/onosproject/ipfix/packet/Ie.java
+++ b/ipfix/src/main/java/org/onosproject/ipfix/packet/Ie.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ipfix/src/main/java/org/onosproject/ipfix/packet/InformationElement.java b/ipfix/src/main/java/org/onosproject/ipfix/packet/InformationElement.java
index 788acb3..3c8e3f8 100644
--- a/ipfix/src/main/java/org/onosproject/ipfix/packet/InformationElement.java
+++ b/ipfix/src/main/java/org/onosproject/ipfix/packet/InformationElement.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ipfix/src/main/java/org/onosproject/ipfix/packet/MessageHeader.java b/ipfix/src/main/java/org/onosproject/ipfix/packet/MessageHeader.java
index 78db882..af18b2c 100644
--- a/ipfix/src/main/java/org/onosproject/ipfix/packet/MessageHeader.java
+++ b/ipfix/src/main/java/org/onosproject/ipfix/packet/MessageHeader.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ipfix/src/main/java/org/onosproject/ipfix/packet/OptionTemplateRecord.java b/ipfix/src/main/java/org/onosproject/ipfix/packet/OptionTemplateRecord.java
index fafad48..859633f 100644
--- a/ipfix/src/main/java/org/onosproject/ipfix/packet/OptionTemplateRecord.java
+++ b/ipfix/src/main/java/org/onosproject/ipfix/packet/OptionTemplateRecord.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ipfix/src/main/java/org/onosproject/ipfix/packet/Record.java b/ipfix/src/main/java/org/onosproject/ipfix/packet/Record.java
index dcafcc8..46e165a 100644
--- a/ipfix/src/main/java/org/onosproject/ipfix/packet/Record.java
+++ b/ipfix/src/main/java/org/onosproject/ipfix/packet/Record.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ipfix/src/main/java/org/onosproject/ipfix/packet/SamplingDataRecord.java b/ipfix/src/main/java/org/onosproject/ipfix/packet/SamplingDataRecord.java
index df9fd11..32c0302 100644
--- a/ipfix/src/main/java/org/onosproject/ipfix/packet/SamplingDataRecord.java
+++ b/ipfix/src/main/java/org/onosproject/ipfix/packet/SamplingDataRecord.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ipfix/src/main/java/org/onosproject/ipfix/packet/SetHeader.java b/ipfix/src/main/java/org/onosproject/ipfix/packet/SetHeader.java
index ee90d54..5c377d5 100644
--- a/ipfix/src/main/java/org/onosproject/ipfix/packet/SetHeader.java
+++ b/ipfix/src/main/java/org/onosproject/ipfix/packet/SetHeader.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ipfix/src/main/java/org/onosproject/ipfix/packet/TemplateRecord.java b/ipfix/src/main/java/org/onosproject/ipfix/packet/TemplateRecord.java
index 12ea916..e4128e2 100644
--- a/ipfix/src/main/java/org/onosproject/ipfix/packet/TemplateRecord.java
+++ b/ipfix/src/main/java/org/onosproject/ipfix/packet/TemplateRecord.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ipfix/src/main/java/org/onosproject/ipfix/packet/package-info.java b/ipfix/src/main/java/org/onosproject/ipfix/packet/package-info.java
index 3a54979..c6e3aaa 100644
--- a/ipfix/src/main/java/org/onosproject/ipfix/packet/package-info.java
+++ b/ipfix/src/main/java/org/onosproject/ipfix/packet/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ipfix/src/test/java/org/onosproject/ipfix/Of2IpfixTest.java b/ipfix/src/test/java/org/onosproject/ipfix/Of2IpfixTest.java
index da690d5..1380edd 100644
--- a/ipfix/src/test/java/org/onosproject/ipfix/Of2IpfixTest.java
+++ b/ipfix/src/test/java/org/onosproject/ipfix/Of2IpfixTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2014 Open Networking Laboratory
+ * Copyright 2014 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/mef-nrp-api/features.xml b/mef-nrp-api/features.xml
index acc4098..10ad9fb 100644
--- a/mef-nrp-api/features.xml
+++ b/mef-nrp-api/features.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
- ~ Copyright 2015 Open Networking Laboratory
+ ~ Copyright 2015 Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/mef-nrp-api/pom.xml b/mef-nrp-api/pom.xml
index 4e49e03..7bafb84 100644
--- a/mef-nrp-api/pom.xml
+++ b/mef-nrp-api/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright 2016 Open Networking Laboratory
+ ~ Copyright 2016 Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/mef-nrp-api/src/main/java/org/onosproject/mefnrpapi/ApiDocRegistrator.java b/mef-nrp-api/src/main/java/org/onosproject/mefnrpapi/ApiDocRegistrator.java
index 756eef0..dcbdf0b 100644
--- a/mef-nrp-api/src/main/java/org/onosproject/mefnrpapi/ApiDocRegistrator.java
+++ b/mef-nrp-api/src/main/java/org/onosproject/mefnrpapi/ApiDocRegistrator.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/mef-nrp-api/src/main/java/org/onosproject/mefnrpapi/MefNrpApiAppComponent.java b/mef-nrp-api/src/main/java/org/onosproject/mefnrpapi/MefNrpApiAppComponent.java
index 0728d1c..f7deb68 100644
--- a/mef-nrp-api/src/main/java/org/onosproject/mefnrpapi/MefNrpApiAppComponent.java
+++ b/mef-nrp-api/src/main/java/org/onosproject/mefnrpapi/MefNrpApiAppComponent.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2014 Open Networking Laboratory
+ * Copyright 2014 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/mef-nrp-api/src/main/java/org/onosproject/mefnrpapi/MefNrpApiWebApplication.java b/mef-nrp-api/src/main/java/org/onosproject/mefnrpapi/MefNrpApiWebApplication.java
index ce55dce..2ff36fa 100644
--- a/mef-nrp-api/src/main/java/org/onosproject/mefnrpapi/MefNrpApiWebApplication.java
+++ b/mef-nrp-api/src/main/java/org/onosproject/mefnrpapi/MefNrpApiWebApplication.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2014-2015 Open Networking Laboratory
+ * Copyright 2014-2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/mef-nrp-api/src/main/java/org/onosproject/mefnrpapi/api/impl/package-info.java b/mef-nrp-api/src/main/java/org/onosproject/mefnrpapi/api/impl/package-info.java
index 8e09240..70b2614 100644
--- a/mef-nrp-api/src/main/java/org/onosproject/mefnrpapi/api/impl/package-info.java
+++ b/mef-nrp-api/src/main/java/org/onosproject/mefnrpapi/api/impl/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
diff --git a/mef-nrp-api/src/main/java/org/onosproject/mefnrpapi/package-info.java b/mef-nrp-api/src/main/java/org/onosproject/mefnrpapi/package-info.java
index a9c80cf..f1cd556 100644
--- a/mef-nrp-api/src/main/java/org/onosproject/mefnrpapi/package-info.java
+++ b/mef-nrp-api/src/main/java/org/onosproject/mefnrpapi/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
diff --git a/mef-nrp-api/src/main/java/org/onosproject/mefnrpapi/translate/NrpApiTranslator.java b/mef-nrp-api/src/main/java/org/onosproject/mefnrpapi/translate/NrpApiTranslator.java
index 00ddb4c..458cf67 100644
--- a/mef-nrp-api/src/main/java/org/onosproject/mefnrpapi/translate/NrpApiTranslator.java
+++ b/mef-nrp-api/src/main/java/org/onosproject/mefnrpapi/translate/NrpApiTranslator.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/mef-nrp-api/src/main/java/org/onosproject/mefnrpapi/translate/package-info.java b/mef-nrp-api/src/main/java/org/onosproject/mefnrpapi/translate/package-info.java
index ca4f384..bc8de56 100644
--- a/mef-nrp-api/src/main/java/org/onosproject/mefnrpapi/translate/package-info.java
+++ b/mef-nrp-api/src/main/java/org/onosproject/mefnrpapi/translate/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
diff --git a/mef-nrp-api/src/main/webapp/WEB-INF/web.xml b/mef-nrp-api/src/main/webapp/WEB-INF/web.xml
index 6304359..b697650 100644
--- a/mef-nrp-api/src/main/webapp/WEB-INF/web.xml
+++ b/mef-nrp-api/src/main/webapp/WEB-INF/web.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright 2016 Open Networking Laboratory
+ ~ Copyright 2016 Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/mef-sca-api/features.xml b/mef-sca-api/features.xml
index f2f5434..98cc974 100644
--- a/mef-sca-api/features.xml
+++ b/mef-sca-api/features.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
- ~ Copyright 2015 Open Networking Laboratory
+ ~ Copyright 2015 Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/mef-sca-api/pom.xml b/mef-sca-api/pom.xml
index e10bb16..1b21456 100644
--- a/mef-sca-api/pom.xml
+++ b/mef-sca-api/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright 2016 Open Networking Laboratory
+ ~ Copyright 2016 Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/mef-sca-api/src/main/java/org/onosproject/mefscaapi/ApiDocRegistrator.java b/mef-sca-api/src/main/java/org/onosproject/mefscaapi/ApiDocRegistrator.java
index df83047..3b2c1df 100644
--- a/mef-sca-api/src/main/java/org/onosproject/mefscaapi/ApiDocRegistrator.java
+++ b/mef-sca-api/src/main/java/org/onosproject/mefscaapi/ApiDocRegistrator.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/mef-sca-api/src/main/java/org/onosproject/mefscaapi/MefScaApiAppComponent.java b/mef-sca-api/src/main/java/org/onosproject/mefscaapi/MefScaApiAppComponent.java
index c9931ef..ae5dbc6 100644
--- a/mef-sca-api/src/main/java/org/onosproject/mefscaapi/MefScaApiAppComponent.java
+++ b/mef-sca-api/src/main/java/org/onosproject/mefscaapi/MefScaApiAppComponent.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2014 Open Networking Laboratory
+ * Copyright 2014 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/mef-sca-api/src/main/java/org/onosproject/mefscaapi/MefScaApiWebApplication.java b/mef-sca-api/src/main/java/org/onosproject/mefscaapi/MefScaApiWebApplication.java
index 57b3d01..54eee0e 100644
--- a/mef-sca-api/src/main/java/org/onosproject/mefscaapi/MefScaApiWebApplication.java
+++ b/mef-sca-api/src/main/java/org/onosproject/mefscaapi/MefScaApiWebApplication.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2014-2015 Open Networking Laboratory
+ * Copyright 2014-2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/mef-sca-api/src/main/java/org/onosproject/mefscaapi/api/impl/package-info.java b/mef-sca-api/src/main/java/org/onosproject/mefscaapi/api/impl/package-info.java
index 2bf415d..72c65d8 100644
--- a/mef-sca-api/src/main/java/org/onosproject/mefscaapi/api/impl/package-info.java
+++ b/mef-sca-api/src/main/java/org/onosproject/mefscaapi/api/impl/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
diff --git a/mef-sca-api/src/main/java/org/onosproject/mefscaapi/package-info.java b/mef-sca-api/src/main/java/org/onosproject/mefscaapi/package-info.java
index 324b59d..e3e6874 100644
--- a/mef-sca-api/src/main/java/org/onosproject/mefscaapi/package-info.java
+++ b/mef-sca-api/src/main/java/org/onosproject/mefscaapi/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
diff --git a/mef-sca-api/src/main/java/org/onosproject/mefscaapi/translate/ScaApiTranslator.java b/mef-sca-api/src/main/java/org/onosproject/mefscaapi/translate/ScaApiTranslator.java
index 8c02670..b7c8d91 100644
--- a/mef-sca-api/src/main/java/org/onosproject/mefscaapi/translate/ScaApiTranslator.java
+++ b/mef-sca-api/src/main/java/org/onosproject/mefscaapi/translate/ScaApiTranslator.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016 Open Networking Laboratory
+ * Copyright 2016 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/mef-sca-api/src/main/java/org/onosproject/mefscaapi/translate/package-info.java b/mef-sca-api/src/main/java/org/onosproject/mefscaapi/translate/package-info.java
index daeec94..ecbb9e3 100644
--- a/mef-sca-api/src/main/java/org/onosproject/mefscaapi/translate/package-info.java
+++ b/mef-sca-api/src/main/java/org/onosproject/mefscaapi/translate/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
diff --git a/mef-sca-api/src/main/webapp/WEB-INF/web.xml b/mef-sca-api/src/main/webapp/WEB-INF/web.xml
index 673644b..c696846 100644
--- a/mef-sca-api/src/main/webapp/WEB-INF/web.xml
+++ b/mef-sca-api/src/main/webapp/WEB-INF/web.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright 2016 Open Networking Laboratory
+ ~ Copyright 2016 Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/oneping/pom.xml b/oneping/pom.xml
index 4cab5da..2b54861 100644
--- a/oneping/pom.xml
+++ b/oneping/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright 2015-2016 Open Networking Laboratory
+ ~ Copyright 2015-2016 Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/oneping/src/main/java/org/onos/oneping/OnePing.java b/oneping/src/main/java/org/onos/oneping/OnePing.java
index 0b16b13..d5b5b6d 100644
--- a/oneping/src/main/java/org/onos/oneping/OnePing.java
+++ b/oneping/src/main/java/org/onos/oneping/OnePing.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/oneping/src/main/java/org/onos/oneping/package-info.java b/oneping/src/main/java/org/onos/oneping/package-info.java
index 357424f..d54deb8 100644
--- a/oneping/src/main/java/org/onos/oneping/package-info.java
+++ b/oneping/src/main/java/org/onos/oneping/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/onos-byon-gui/pom.xml b/onos-byon-gui/pom.xml
index 01e8c59..7e3a2a8 100644
--- a/onos-byon-gui/pom.xml
+++ b/onos-byon-gui/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright 2015-2016 Open Networking Laboratory
+ ~ Copyright 2015-2016 Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/onos-byon-gui/src/main/java/org/onosproject/byon/gui/NetworkOverlayMessageHandler.java b/onos-byon-gui/src/main/java/org/onosproject/byon/gui/NetworkOverlayMessageHandler.java
index 6db485f..967628e 100644
--- a/onos-byon-gui/src/main/java/org/onosproject/byon/gui/NetworkOverlayMessageHandler.java
+++ b/onos-byon-gui/src/main/java/org/onosproject/byon/gui/NetworkOverlayMessageHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2014-2015 Open Networking Laboratory
+ * Copyright 2014-2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/onos-byon-gui/src/main/java/org/onosproject/byon/gui/NetworkTableViewMessageHandler.java b/onos-byon-gui/src/main/java/org/onosproject/byon/gui/NetworkTableViewMessageHandler.java
index 4b227fb..67f5c41 100644
--- a/onos-byon-gui/src/main/java/org/onosproject/byon/gui/NetworkTableViewMessageHandler.java
+++ b/onos-byon-gui/src/main/java/org/onosproject/byon/gui/NetworkTableViewMessageHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2014-2015 Open Networking Laboratory
+ * Copyright 2014-2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/onos-byon-gui/src/main/java/org/onosproject/byon/gui/NetworkTopoOverlay.java b/onos-byon-gui/src/main/java/org/onosproject/byon/gui/NetworkTopoOverlay.java
index 42b582f..16f0fe3 100644
--- a/onos-byon-gui/src/main/java/org/onosproject/byon/gui/NetworkTopoOverlay.java
+++ b/onos-byon-gui/src/main/java/org/onosproject/byon/gui/NetworkTopoOverlay.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2014-2015 Open Networking Laboratory
+ * Copyright 2014-2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/onos-byon-gui/src/main/java/org/onosproject/byon/gui/NetworkUiComponent.java b/onos-byon-gui/src/main/java/org/onosproject/byon/gui/NetworkUiComponent.java
index 9c939a1..42f3948 100644
--- a/onos-byon-gui/src/main/java/org/onosproject/byon/gui/NetworkUiComponent.java
+++ b/onos-byon-gui/src/main/java/org/onosproject/byon/gui/NetworkUiComponent.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2014-2015 Open Networking Laboratory
+ * Copyright 2014-2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/onos-byon-gui/src/main/resources/app/view/byonTopov/byonTopov.html b/onos-byon-gui/src/main/resources/app/view/byonTopov/byonTopov.html
index 03421d4..43592b9 100644
--- a/onos-byon-gui/src/main/resources/app/view/byonTopov/byonTopov.html
+++ b/onos-byon-gui/src/main/resources/app/view/byonTopov/byonTopov.html
@@ -1,5 +1,5 @@
<!--
- ~ Copyright 2014-2015 Open Networking Laboratory
+ ~ Copyright 2014-2015 Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/onos-byon-gui/src/main/resources/app/view/byonTopov/byonTopovOverlay.js b/onos-byon-gui/src/main/resources/app/view/byonTopov/byonTopovOverlay.js
index 341a322..ad0dc26 100644
--- a/onos-byon-gui/src/main/resources/app/view/byonTopov/byonTopovOverlay.js
+++ b/onos-byon-gui/src/main/resources/app/view/byonTopov/byonTopovOverlay.js
@@ -1,5 +1,5 @@
/*
- * Copyright 2014-2015 Open Networking Laboratory
+ * Copyright 2014-2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/onos-byon-gui/src/main/resources/app/view/byonTopov/byonTopovService.js b/onos-byon-gui/src/main/resources/app/view/byonTopov/byonTopovService.js
index 1fedd6d..d785bdc 100644
--- a/onos-byon-gui/src/main/resources/app/view/byonTopov/byonTopovService.js
+++ b/onos-byon-gui/src/main/resources/app/view/byonTopov/byonTopovService.js
@@ -1,5 +1,5 @@
/*
- * Copyright 2014-2015 Open Networking Laboratory
+ * Copyright 2014-2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ovsdb-rest/src/main/java/org/onosproject/ovsdbrest/ConnectionHandler.java b/ovsdb-rest/src/main/java/org/onosproject/ovsdbrest/ConnectionHandler.java
index e00eb28..85b5503 100644
--- a/ovsdb-rest/src/main/java/org/onosproject/ovsdbrest/ConnectionHandler.java
+++ b/ovsdb-rest/src/main/java/org/onosproject/ovsdbrest/ConnectionHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017-present Open Networking Laboratory
+ * Copyright 2017-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ovsdb-rest/src/main/java/org/onosproject/ovsdbrest/OvsdbBridgeManager.java b/ovsdb-rest/src/main/java/org/onosproject/ovsdbrest/OvsdbBridgeManager.java
index 85eef31..a281e09 100644
--- a/ovsdb-rest/src/main/java/org/onosproject/ovsdbrest/OvsdbBridgeManager.java
+++ b/ovsdb-rest/src/main/java/org/onosproject/ovsdbrest/OvsdbBridgeManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017-present Open Networking Laboratory
+ * Copyright 2017-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ovsdb-rest/src/main/java/org/onosproject/ovsdbrest/OvsdbBridgeService.java b/ovsdb-rest/src/main/java/org/onosproject/ovsdbrest/OvsdbBridgeService.java
index 6f69f69..76e9f0c 100644
--- a/ovsdb-rest/src/main/java/org/onosproject/ovsdbrest/OvsdbBridgeService.java
+++ b/ovsdb-rest/src/main/java/org/onosproject/ovsdbrest/OvsdbBridgeService.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017-present Open Networking Laboratory
+ * Copyright 2017-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ovsdb-rest/src/main/java/org/onosproject/ovsdbrest/OvsdbNodeConfig.java b/ovsdb-rest/src/main/java/org/onosproject/ovsdbrest/OvsdbNodeConfig.java
index 5caa9d3..14c4fcf 100644
--- a/ovsdb-rest/src/main/java/org/onosproject/ovsdbrest/OvsdbNodeConfig.java
+++ b/ovsdb-rest/src/main/java/org/onosproject/ovsdbrest/OvsdbNodeConfig.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017-present Open Networking Laboratory
+ * Copyright 2017-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ovsdb-rest/src/main/java/org/onosproject/ovsdbrest/OvsdbRestException.java b/ovsdb-rest/src/main/java/org/onosproject/ovsdbrest/OvsdbRestException.java
index c6aa621..7e9a524 100644
--- a/ovsdb-rest/src/main/java/org/onosproject/ovsdbrest/OvsdbRestException.java
+++ b/ovsdb-rest/src/main/java/org/onosproject/ovsdbrest/OvsdbRestException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017-present Open Networking Laboratory
+ * Copyright 2017-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ovsdb-rest/src/main/java/org/onosproject/ovsdbrest/package-info.java b/ovsdb-rest/src/main/java/org/onosproject/ovsdbrest/package-info.java
index a15b6a3..3966792 100644
--- a/ovsdb-rest/src/main/java/org/onosproject/ovsdbrest/package-info.java
+++ b/ovsdb-rest/src/main/java/org/onosproject/ovsdbrest/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017-present Open Networking Laboratory
+ * Copyright 2017-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ovsdb-rest/src/main/java/org/onosproject/ovsdbrest/rest/OvsdbBridgeWebResource.java b/ovsdb-rest/src/main/java/org/onosproject/ovsdbrest/rest/OvsdbBridgeWebResource.java
index f00bd0d..b85cb88 100644
--- a/ovsdb-rest/src/main/java/org/onosproject/ovsdbrest/rest/OvsdbBridgeWebResource.java
+++ b/ovsdb-rest/src/main/java/org/onosproject/ovsdbrest/rest/OvsdbBridgeWebResource.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017-present Open Networking Laboratory
+ * Copyright 2017-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ovsdb-rest/src/main/java/org/onosproject/ovsdbrest/rest/OvsdbRestApp.java b/ovsdb-rest/src/main/java/org/onosproject/ovsdbrest/rest/OvsdbRestApp.java
index a308409..ece24ce 100644
--- a/ovsdb-rest/src/main/java/org/onosproject/ovsdbrest/rest/OvsdbRestApp.java
+++ b/ovsdb-rest/src/main/java/org/onosproject/ovsdbrest/rest/OvsdbRestApp.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017-present Open Networking Laboratory
+ * Copyright 2017-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ovsdb-rest/src/main/java/org/onosproject/ovsdbrest/rest/package-info.java b/ovsdb-rest/src/main/java/org/onosproject/ovsdbrest/rest/package-info.java
index 32a6dc2..2ba22a8 100644
--- a/ovsdb-rest/src/main/java/org/onosproject/ovsdbrest/rest/package-info.java
+++ b/ovsdb-rest/src/main/java/org/onosproject/ovsdbrest/rest/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017-present Open Networking Laboratory
+ * Copyright 2017-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/ovsdb-rest/src/main/webapp/WEB-INF/web.xml b/ovsdb-rest/src/main/webapp/WEB-INF/web.xml
index 8725ab5..d7468aa 100644
--- a/ovsdb-rest/src/main/webapp/WEB-INF/web.xml
+++ b/ovsdb-rest/src/main/webapp/WEB-INF/web.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright 2016-present Open Networking Laboratory
+ ~ Copyright 2016-present Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/patchpanel/pom.xml b/patchpanel/pom.xml
index 8f0ae81..91201ad 100644
--- a/patchpanel/pom.xml
+++ b/patchpanel/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright 2016-present Open Networking Laboratory
+ ~ Copyright 2016-present Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/patchpanel/src/main/java/org/onosproject/patchpanel/cli/PatchListCommand.java b/patchpanel/src/main/java/org/onosproject/patchpanel/cli/PatchListCommand.java
index 9d8f088..fb5766b 100644
--- a/patchpanel/src/main/java/org/onosproject/patchpanel/cli/PatchListCommand.java
+++ b/patchpanel/src/main/java/org/onosproject/patchpanel/cli/PatchListCommand.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/patchpanel/src/main/java/org/onosproject/patchpanel/cli/PatchPanelCommand.java b/patchpanel/src/main/java/org/onosproject/patchpanel/cli/PatchPanelCommand.java
index 5b6221a..a7e9e5e 100644
--- a/patchpanel/src/main/java/org/onosproject/patchpanel/cli/PatchPanelCommand.java
+++ b/patchpanel/src/main/java/org/onosproject/patchpanel/cli/PatchPanelCommand.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/patchpanel/src/main/java/org/onosproject/patchpanel/cli/PatchRemoveCommand.java b/patchpanel/src/main/java/org/onosproject/patchpanel/cli/PatchRemoveCommand.java
index 429cd50..1732051 100644
--- a/patchpanel/src/main/java/org/onosproject/patchpanel/cli/PatchRemoveCommand.java
+++ b/patchpanel/src/main/java/org/onosproject/patchpanel/cli/PatchRemoveCommand.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/patchpanel/src/main/java/org/onosproject/patchpanel/cli/package-info.java b/patchpanel/src/main/java/org/onosproject/patchpanel/cli/package-info.java
index f4e7c9e..50e1ab9 100644
--- a/patchpanel/src/main/java/org/onosproject/patchpanel/cli/package-info.java
+++ b/patchpanel/src/main/java/org/onosproject/patchpanel/cli/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/patchpanel/src/main/java/org/onosproject/patchpanel/impl/Patch.java b/patchpanel/src/main/java/org/onosproject/patchpanel/impl/Patch.java
index 3b1c821..319e87a 100644
--- a/patchpanel/src/main/java/org/onosproject/patchpanel/impl/Patch.java
+++ b/patchpanel/src/main/java/org/onosproject/patchpanel/impl/Patch.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/patchpanel/src/main/java/org/onosproject/patchpanel/impl/PatchId.java b/patchpanel/src/main/java/org/onosproject/patchpanel/impl/PatchId.java
index d40cb21..1948304 100644
--- a/patchpanel/src/main/java/org/onosproject/patchpanel/impl/PatchId.java
+++ b/patchpanel/src/main/java/org/onosproject/patchpanel/impl/PatchId.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/patchpanel/src/main/java/org/onosproject/patchpanel/impl/PatchPanel.java b/patchpanel/src/main/java/org/onosproject/patchpanel/impl/PatchPanel.java
index e10b097..6afd3d1 100644
--- a/patchpanel/src/main/java/org/onosproject/patchpanel/impl/PatchPanel.java
+++ b/patchpanel/src/main/java/org/onosproject/patchpanel/impl/PatchPanel.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/patchpanel/src/main/java/org/onosproject/patchpanel/impl/PatchPanelService.java b/patchpanel/src/main/java/org/onosproject/patchpanel/impl/PatchPanelService.java
index 4ece312..9e7c115 100644
--- a/patchpanel/src/main/java/org/onosproject/patchpanel/impl/PatchPanelService.java
+++ b/patchpanel/src/main/java/org/onosproject/patchpanel/impl/PatchPanelService.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/patchpanel/src/main/java/org/onosproject/patchpanel/impl/PatchPanelUiComponent.java b/patchpanel/src/main/java/org/onosproject/patchpanel/impl/PatchPanelUiComponent.java
index ea2f085..a850eba 100644
--- a/patchpanel/src/main/java/org/onosproject/patchpanel/impl/PatchPanelUiComponent.java
+++ b/patchpanel/src/main/java/org/onosproject/patchpanel/impl/PatchPanelUiComponent.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/patchpanel/src/main/java/org/onosproject/patchpanel/impl/PatchPanelUiMessageHandler.java b/patchpanel/src/main/java/org/onosproject/patchpanel/impl/PatchPanelUiMessageHandler.java
index d9d3086..0ca2d0f 100644
--- a/patchpanel/src/main/java/org/onosproject/patchpanel/impl/PatchPanelUiMessageHandler.java
+++ b/patchpanel/src/main/java/org/onosproject/patchpanel/impl/PatchPanelUiMessageHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/patchpanel/src/main/java/org/onosproject/patchpanel/impl/package-info.java b/patchpanel/src/main/java/org/onosproject/patchpanel/impl/package-info.java
index 7c109d2..5c146c5 100644
--- a/patchpanel/src/main/java/org/onosproject/patchpanel/impl/package-info.java
+++ b/patchpanel/src/main/java/org/onosproject/patchpanel/impl/package-info.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/patchpanel/src/main/resources/OSGI-INF/blueprint/shell-config.xml b/patchpanel/src/main/resources/OSGI-INF/blueprint/shell-config.xml
index 1db5a5d..a10fbdb 100644
--- a/patchpanel/src/main/resources/OSGI-INF/blueprint/shell-config.xml
+++ b/patchpanel/src/main/resources/OSGI-INF/blueprint/shell-config.xml
@@ -1,5 +1,5 @@
<!--
- ~ Copyright 2016-present Open Networking Laboratory
+ ~ Copyright 2016-present Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/pom.xml b/pom.xml
index bfa2bf9..5c769fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright 2014 Open Networking Laboratory
+ ~ Copyright 2014 Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/pppoe/api/pom.xml b/pppoe/api/pom.xml
index e1ad9c0..4458432 100755
--- a/pppoe/api/pom.xml
+++ b/pppoe/api/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright 2017-present Open Networking Laboratory
+ ~ Copyright 2017-present Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/pppoe/api/src/main/java/org/onosproject/pppoe/api/PppoeClientInfo.java b/pppoe/api/src/main/java/org/onosproject/pppoe/api/PppoeClientInfo.java
index 219dc7c..22ffe0a 100755
--- a/pppoe/api/src/main/java/org/onosproject/pppoe/api/PppoeClientInfo.java
+++ b/pppoe/api/src/main/java/org/onosproject/pppoe/api/PppoeClientInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017-present Open Networking Laboratory
+ * Copyright 2017-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the Client.
diff --git a/pppoe/api/src/main/java/org/onosproject/pppoe/api/PppoeClientInfoCodec.java b/pppoe/api/src/main/java/org/onosproject/pppoe/api/PppoeClientInfoCodec.java
index 9950fa3..c1a5be7 100755
--- a/pppoe/api/src/main/java/org/onosproject/pppoe/api/PppoeClientInfoCodec.java
+++ b/pppoe/api/src/main/java/org/onosproject/pppoe/api/PppoeClientInfoCodec.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017-present Open Networking Laboratory
+ * Copyright 2017-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/pppoe/api/src/main/java/org/onosproject/pppoe/api/PppoeDeviceInfo.java b/pppoe/api/src/main/java/org/onosproject/pppoe/api/PppoeDeviceInfo.java
index 756423d..a011afb 100755
--- a/pppoe/api/src/main/java/org/onosproject/pppoe/api/PppoeDeviceInfo.java
+++ b/pppoe/api/src/main/java/org/onosproject/pppoe/api/PppoeDeviceInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017-present Open Networking Laboratory
+ * Copyright 2017-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/pppoe/api/src/main/java/org/onosproject/pppoe/api/PppoeDeviceInfoCodec.java b/pppoe/api/src/main/java/org/onosproject/pppoe/api/PppoeDeviceInfoCodec.java
index d3944bd..209eadf 100755
--- a/pppoe/api/src/main/java/org/onosproject/pppoe/api/PppoeDeviceInfoCodec.java
+++ b/pppoe/api/src/main/java/org/onosproject/pppoe/api/PppoeDeviceInfoCodec.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017-present Open Networking Laboratory
+ * Copyright 2017-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the Device.
diff --git a/pppoe/api/src/main/java/org/onosproject/pppoe/api/PppoeServerInfo.java b/pppoe/api/src/main/java/org/onosproject/pppoe/api/PppoeServerInfo.java
index ef2918d..076ab29 100755
--- a/pppoe/api/src/main/java/org/onosproject/pppoe/api/PppoeServerInfo.java
+++ b/pppoe/api/src/main/java/org/onosproject/pppoe/api/PppoeServerInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017-present Open Networking Laboratory
+ * Copyright 2017-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the Server.
diff --git a/pppoe/api/src/main/java/org/onosproject/pppoe/api/PppoeServerInfoCodec.java b/pppoe/api/src/main/java/org/onosproject/pppoe/api/PppoeServerInfoCodec.java
index a9fff20..d38a648 100755
--- a/pppoe/api/src/main/java/org/onosproject/pppoe/api/PppoeServerInfoCodec.java
+++ b/pppoe/api/src/main/java/org/onosproject/pppoe/api/PppoeServerInfoCodec.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017-present Open Networking Laboratory
+ * Copyright 2017-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/pppoe/api/src/main/java/org/onosproject/pppoe/api/PppoeService.java b/pppoe/api/src/main/java/org/onosproject/pppoe/api/PppoeService.java
index 8564387..b4d71c5 100755
--- a/pppoe/api/src/main/java/org/onosproject/pppoe/api/PppoeService.java
+++ b/pppoe/api/src/main/java/org/onosproject/pppoe/api/PppoeService.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/pppoe/api/src/main/java/org/onosproject/pppoe/api/PppoeSessionInfo.java b/pppoe/api/src/main/java/org/onosproject/pppoe/api/PppoeSessionInfo.java
index 3471cfc..922f4d5 100755
--- a/pppoe/api/src/main/java/org/onosproject/pppoe/api/PppoeSessionInfo.java
+++ b/pppoe/api/src/main/java/org/onosproject/pppoe/api/PppoeSessionInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017-present Open Networking Laboratory
+ * Copyright 2017-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the Session.
diff --git a/pppoe/api/src/main/java/org/onosproject/pppoe/api/PppoeSessionInfoCodec.java b/pppoe/api/src/main/java/org/onosproject/pppoe/api/PppoeSessionInfoCodec.java
index 063c45f..4ff71e2 100755
--- a/pppoe/api/src/main/java/org/onosproject/pppoe/api/PppoeSessionInfoCodec.java
+++ b/pppoe/api/src/main/java/org/onosproject/pppoe/api/PppoeSessionInfoCodec.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017-present Open Networking Laboratory
+ * Copyright 2017-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/pppoe/api/src/main/java/org/onosproject/pppoe/api/package-info.java b/pppoe/api/src/main/java/org/onosproject/pppoe/api/package-info.java
index 95326d5..cb8efd6 100755
--- a/pppoe/api/src/main/java/org/onosproject/pppoe/api/package-info.java
+++ b/pppoe/api/src/main/java/org/onosproject/pppoe/api/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017-present Open Networking Laboratory
+ * Copyright 2017-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/pppoe/api/src/test/java/org/onosproject/pppoe/api/PppoeClientInfoTest.java b/pppoe/api/src/test/java/org/onosproject/pppoe/api/PppoeClientInfoTest.java
index 53d66ce..873c4f2 100755
--- a/pppoe/api/src/test/java/org/onosproject/pppoe/api/PppoeClientInfoTest.java
+++ b/pppoe/api/src/test/java/org/onosproject/pppoe/api/PppoeClientInfoTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017-present Open Networking Laboratory
+ * Copyright 2017-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/pppoe/app/app.xml b/pppoe/app/app.xml
index 91c1c59..240ad64 100755
--- a/pppoe/app/app.xml
+++ b/pppoe/app/app.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright 2017-present Open Networking Laboratory
+ ~ Copyright 2017-present Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/pppoe/app/features.xml b/pppoe/app/features.xml
index 24a52cc..2defc3e 100755
--- a/pppoe/app/features.xml
+++ b/pppoe/app/features.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
- ~ Copyright 2017-present Open Networking Laboratory
+ ~ Copyright 2017-present Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/pppoe/app/pom.xml b/pppoe/app/pom.xml
index 7a0ff8b..e786920 100755
--- a/pppoe/app/pom.xml
+++ b/pppoe/app/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright 2017-present Open Networking Laboratory
+ ~ Copyright 2017-present Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/pppoe/app/src/main/java/org/onosproject/pppoe/PppoeBreakException.java b/pppoe/app/src/main/java/org/onosproject/pppoe/PppoeBreakException.java
index 553c885..ffda249 100755
--- a/pppoe/app/src/main/java/org/onosproject/pppoe/PppoeBreakException.java
+++ b/pppoe/app/src/main/java/org/onosproject/pppoe/PppoeBreakException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017-present Open Networking Laboratory
+ * Copyright 2017-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/pppoe/app/src/main/java/org/onosproject/pppoe/PppoeClientManager.java b/pppoe/app/src/main/java/org/onosproject/pppoe/PppoeClientManager.java
index a265696..b6a805f 100755
--- a/pppoe/app/src/main/java/org/onosproject/pppoe/PppoeClientManager.java
+++ b/pppoe/app/src/main/java/org/onosproject/pppoe/PppoeClientManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017-present Open Networking Laboratory
+ * Copyright 2017-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/pppoe/app/src/main/java/org/onosproject/pppoe/PppoeDeviceManager.java b/pppoe/app/src/main/java/org/onosproject/pppoe/PppoeDeviceManager.java
index 948551e..4947b21 100755
--- a/pppoe/app/src/main/java/org/onosproject/pppoe/PppoeDeviceManager.java
+++ b/pppoe/app/src/main/java/org/onosproject/pppoe/PppoeDeviceManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017-present Open Networking Laboratory
+ * Copyright 2017-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/pppoe/app/src/main/java/org/onosproject/pppoe/PppoeManager.java b/pppoe/app/src/main/java/org/onosproject/pppoe/PppoeManager.java
index a67440d..9686655 100755
--- a/pppoe/app/src/main/java/org/onosproject/pppoe/PppoeManager.java
+++ b/pppoe/app/src/main/java/org/onosproject/pppoe/PppoeManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017-present Open Networking Laboratory
+ * Copyright 2017-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/pppoe/app/src/main/java/org/onosproject/pppoe/PppoeServerManager.java b/pppoe/app/src/main/java/org/onosproject/pppoe/PppoeServerManager.java
index 428b5bc..08ebd50 100755
--- a/pppoe/app/src/main/java/org/onosproject/pppoe/PppoeServerManager.java
+++ b/pppoe/app/src/main/java/org/onosproject/pppoe/PppoeServerManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017-present Open Networking Laboratory
+ * Copyright 2017-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/pppoe/app/src/main/java/org/onosproject/pppoe/cli/PppoeConfigClientCommand.java b/pppoe/app/src/main/java/org/onosproject/pppoe/cli/PppoeConfigClientCommand.java
index a1a30e6..204d359 100755
--- a/pppoe/app/src/main/java/org/onosproject/pppoe/cli/PppoeConfigClientCommand.java
+++ b/pppoe/app/src/main/java/org/onosproject/pppoe/cli/PppoeConfigClientCommand.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017-present Open Networking Laboratory
+ * Copyright 2017-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/pppoe/app/src/main/java/org/onosproject/pppoe/cli/PppoeConfigServerCommand.java b/pppoe/app/src/main/java/org/onosproject/pppoe/cli/PppoeConfigServerCommand.java
index 9e2c2d2..a9c5813 100755
--- a/pppoe/app/src/main/java/org/onosproject/pppoe/cli/PppoeConfigServerCommand.java
+++ b/pppoe/app/src/main/java/org/onosproject/pppoe/cli/PppoeConfigServerCommand.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017-present Open Networking Laboratory
+ * Copyright 2017-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/pppoe/app/src/main/java/org/onosproject/pppoe/cli/PppoeGetClientsCommand.java b/pppoe/app/src/main/java/org/onosproject/pppoe/cli/PppoeGetClientsCommand.java
index 3622608..b35cf9a 100755
--- a/pppoe/app/src/main/java/org/onosproject/pppoe/cli/PppoeGetClientsCommand.java
+++ b/pppoe/app/src/main/java/org/onosproject/pppoe/cli/PppoeGetClientsCommand.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017-present Open Networking Laboratory
+ * Copyright 2017-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/pppoe/app/src/main/java/org/onosproject/pppoe/cli/PppoeGetServerCommand.java b/pppoe/app/src/main/java/org/onosproject/pppoe/cli/PppoeGetServerCommand.java
index 240392b..6356033 100755
--- a/pppoe/app/src/main/java/org/onosproject/pppoe/cli/PppoeGetServerCommand.java
+++ b/pppoe/app/src/main/java/org/onosproject/pppoe/cli/PppoeGetServerCommand.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017-present Open Networking Laboratory
+ * Copyright 2017-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/pppoe/app/src/main/java/org/onosproject/pppoe/cli/PppoeGetSessionsCommand.java b/pppoe/app/src/main/java/org/onosproject/pppoe/cli/PppoeGetSessionsCommand.java
index 17f29cf..78fe16e 100755
--- a/pppoe/app/src/main/java/org/onosproject/pppoe/cli/PppoeGetSessionsCommand.java
+++ b/pppoe/app/src/main/java/org/onosproject/pppoe/cli/PppoeGetSessionsCommand.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017-present Open Networking Laboratory
+ * Copyright 2017-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/pppoe/app/src/main/java/org/onosproject/pppoe/cli/package-info.java b/pppoe/app/src/main/java/org/onosproject/pppoe/cli/package-info.java
index 5f4dc47..3803582 100755
--- a/pppoe/app/src/main/java/org/onosproject/pppoe/cli/package-info.java
+++ b/pppoe/app/src/main/java/org/onosproject/pppoe/cli/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017-present Open Networking Laboratory
+ * Copyright 2017-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/pppoe/app/src/main/java/org/onosproject/pppoe/package-info.java b/pppoe/app/src/main/java/org/onosproject/pppoe/package-info.java
index 36af864..65a0383 100755
--- a/pppoe/app/src/main/java/org/onosproject/pppoe/package-info.java
+++ b/pppoe/app/src/main/java/org/onosproject/pppoe/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/pppoe/app/src/main/resources/OSGI-INF/blueprint/shell-config.xml b/pppoe/app/src/main/resources/OSGI-INF/blueprint/shell-config.xml
index b512127..0b64ce9 100755
--- a/pppoe/app/src/main/resources/OSGI-INF/blueprint/shell-config.xml
+++ b/pppoe/app/src/main/resources/OSGI-INF/blueprint/shell-config.xml
@@ -1,5 +1,5 @@
<!--
- ~ Copyright 2016-present Open Networking Laboratory
+ ~ Copyright 2016-present Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/pppoe/app/src/test/java/org/onosproject/pppoe/PppoeClientManagerTest.java b/pppoe/app/src/test/java/org/onosproject/pppoe/PppoeClientManagerTest.java
index 4b889ba..fd82c84 100755
--- a/pppoe/app/src/test/java/org/onosproject/pppoe/PppoeClientManagerTest.java
+++ b/pppoe/app/src/test/java/org/onosproject/pppoe/PppoeClientManagerTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017-present Open Networking Laboratory
+ * Copyright 2017-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/pppoe/driver/pom.xml b/pppoe/driver/pom.xml
index 1656f37..c1df286 100755
--- a/pppoe/driver/pom.xml
+++ b/pppoe/driver/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright 2017-present Open Networking Laboratory
+ ~ Copyright 2017-present Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/pppoe/driver/src/main/java/org/onosproject/pppoe/driver/PppoeDeviceConfig.java b/pppoe/driver/src/main/java/org/onosproject/pppoe/driver/PppoeDeviceConfig.java
index 0acc5fe..4ac9621 100755
--- a/pppoe/driver/src/main/java/org/onosproject/pppoe/driver/PppoeDeviceConfig.java
+++ b/pppoe/driver/src/main/java/org/onosproject/pppoe/driver/PppoeDeviceConfig.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/pppoe/driver/src/main/java/org/onosproject/pppoe/driver/PppoeDeviceConfigRestImpl.java b/pppoe/driver/src/main/java/org/onosproject/pppoe/driver/PppoeDeviceConfigRestImpl.java
index 31451ea..41b2f6a 100755
--- a/pppoe/driver/src/main/java/org/onosproject/pppoe/driver/PppoeDeviceConfigRestImpl.java
+++ b/pppoe/driver/src/main/java/org/onosproject/pppoe/driver/PppoeDeviceConfigRestImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017-present Open Networking Laboratory
+ * Copyright 2017-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/pppoe/driver/src/main/java/org/onosproject/pppoe/driver/PppoeDriverLoader.java b/pppoe/driver/src/main/java/org/onosproject/pppoe/driver/PppoeDriverLoader.java
index b7defa2..a836247 100755
--- a/pppoe/driver/src/main/java/org/onosproject/pppoe/driver/PppoeDriverLoader.java
+++ b/pppoe/driver/src/main/java/org/onosproject/pppoe/driver/PppoeDriverLoader.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017-present Open Networking Laboratory
+ * Copyright 2017-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/pppoe/driver/src/main/java/org/onosproject/pppoe/driver/package-info.java b/pppoe/driver/src/main/java/org/onosproject/pppoe/driver/package-info.java
index 0d332c8..db2a414 100755
--- a/pppoe/driver/src/main/java/org/onosproject/pppoe/driver/package-info.java
+++ b/pppoe/driver/src/main/java/org/onosproject/pppoe/driver/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017-present Open Networking Laboratory
+ * Copyright 2017-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/pppoe/driver/src/main/resources/pppoe-drivers.xml b/pppoe/driver/src/main/resources/pppoe-drivers.xml
index e5b08c8..69f76d1 100755
--- a/pppoe/driver/src/main/resources/pppoe-drivers.xml
+++ b/pppoe/driver/src/main/resources/pppoe-drivers.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright 2016-present Open Networking Laboratory
+ ~ Copyright 2016-present Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/pppoe/pom.xml b/pppoe/pom.xml
index f0f5394..9917925 100755
--- a/pppoe/pom.xml
+++ b/pppoe/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright 2017-present Open Networking Laboratory
+ ~ Copyright 2017-present Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/sdx-l2/pom.xml b/sdx-l2/pom.xml
index 97f6c92..ec15294 100644
--- a/sdx-l2/pom.xml
+++ b/sdx-l2/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright 2016-present Open Networking Laboratory
+ ~ Copyright 2016-present Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2ArpNdpHandler.java b/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2ArpNdpHandler.java
index 377d46a..54c449b 100644
--- a/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2ArpNdpHandler.java
+++ b/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2ArpNdpHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2ConnectionPoint.java b/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2ConnectionPoint.java
index f4180bb..7387848 100644
--- a/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2ConnectionPoint.java
+++ b/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2ConnectionPoint.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2ConnectionPointMatcher.java b/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2ConnectionPointMatcher.java
index 2ba0ce8..dd162f2 100644
--- a/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2ConnectionPointMatcher.java
+++ b/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2ConnectionPointMatcher.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2ConnectionPointSerializer.java b/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2ConnectionPointSerializer.java
index 014d7fc..c512539 100644
--- a/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2ConnectionPointSerializer.java
+++ b/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2ConnectionPointSerializer.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2DistributedStore.java b/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2DistributedStore.java
index 152fe9b..f99caac 100644
--- a/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2DistributedStore.java
+++ b/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2DistributedStore.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2Exception.java b/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2Exception.java
index cd7973b..3cf4de7 100644
--- a/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2Exception.java
+++ b/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2Exception.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2MacVCManager.java b/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2MacVCManager.java
index b3bb1ce..eae4a67 100644
--- a/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2MacVCManager.java
+++ b/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2MacVCManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2Manager.java b/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2Manager.java
index 6e633a7..4d8b63e 100644
--- a/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2Manager.java
+++ b/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2Manager.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2MonitoringManager.java b/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2MonitoringManager.java
index 9eaa0fd..edfe93c 100644
--- a/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2MonitoringManager.java
+++ b/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2MonitoringManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2MonitoringService.java b/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2MonitoringService.java
index 4da17e0..22a8f8b 100644
--- a/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2MonitoringService.java
+++ b/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2MonitoringService.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2MplsVCManager.java b/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2MplsVCManager.java
index e6c4081..3cd98b4 100644
--- a/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2MplsVCManager.java
+++ b/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2MplsVCManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2Service.java b/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2Service.java
index 30703be..e7bc660 100644
--- a/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2Service.java
+++ b/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2Service.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2State.java b/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2State.java
index ae00561..98e1746 100644
--- a/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2State.java
+++ b/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2State.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2Store.java b/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2Store.java
index b824b23..055b346 100644
--- a/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2Store.java
+++ b/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2Store.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2VCManager.java b/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2VCManager.java
index 18d53aa..3354872 100644
--- a/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2VCManager.java
+++ b/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2VCManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2VCService.java b/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2VCService.java
index 6b1d8ec..09a463a 100644
--- a/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2VCService.java
+++ b/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2VCService.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2VlanVCManager.java b/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2VlanVCManager.java
index dcb4122..9097a85 100644
--- a/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2VlanVCManager.java
+++ b/sdx-l2/src/main/java/org/onosproject/sdxl2/SdxL2VlanVCManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l2/src/main/java/org/onosproject/sdxl2/VirtualCircuit.java b/sdx-l2/src/main/java/org/onosproject/sdxl2/VirtualCircuit.java
index 7191346..eb981d4 100644
--- a/sdx-l2/src/main/java/org/onosproject/sdxl2/VirtualCircuit.java
+++ b/sdx-l2/src/main/java/org/onosproject/sdxl2/VirtualCircuit.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l2/src/main/java/org/onosproject/sdxl2/VirtualCircuitMechanism.java b/sdx-l2/src/main/java/org/onosproject/sdxl2/VirtualCircuitMechanism.java
index da4ed35..94ddee2 100644
--- a/sdx-l2/src/main/java/org/onosproject/sdxl2/VirtualCircuitMechanism.java
+++ b/sdx-l2/src/main/java/org/onosproject/sdxl2/VirtualCircuitMechanism.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/SdxL2AddCPCommand.java b/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/SdxL2AddCPCommand.java
index 2f1b399..01e4a3c 100644
--- a/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/SdxL2AddCPCommand.java
+++ b/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/SdxL2AddCPCommand.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/SdxL2AddCommand.java b/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/SdxL2AddCommand.java
index 5794faf..30e7f6e 100644
--- a/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/SdxL2AddCommand.java
+++ b/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/SdxL2AddCommand.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/SdxL2AddVCCommand.java b/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/SdxL2AddVCCommand.java
index cafc82f..72cd886 100644
--- a/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/SdxL2AddVCCommand.java
+++ b/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/SdxL2AddVCCommand.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/SdxL2CleanCommand.java b/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/SdxL2CleanCommand.java
index ef1b7ba..4b43852 100644
--- a/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/SdxL2CleanCommand.java
+++ b/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/SdxL2CleanCommand.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/SdxL2GetCPCommand.java b/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/SdxL2GetCPCommand.java
index 3bd4949..ec9971c 100644
--- a/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/SdxL2GetCPCommand.java
+++ b/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/SdxL2GetCPCommand.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/SdxL2GetVCCommand.java b/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/SdxL2GetVCCommand.java
index b957d69..3db8b8c 100644
--- a/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/SdxL2GetVCCommand.java
+++ b/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/SdxL2GetVCCommand.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/SdxL2ListCPCommand.java b/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/SdxL2ListCPCommand.java
index 29c4f59..ae5a87f 100644
--- a/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/SdxL2ListCPCommand.java
+++ b/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/SdxL2ListCPCommand.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/SdxL2ListCommand.java b/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/SdxL2ListCommand.java
index 0fe370a..5880e9c 100644
--- a/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/SdxL2ListCommand.java
+++ b/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/SdxL2ListCommand.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/SdxL2ListVCCommand.java b/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/SdxL2ListVCCommand.java
index 319372f..5f06cd1 100644
--- a/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/SdxL2ListVCCommand.java
+++ b/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/SdxL2ListVCCommand.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/SdxL2RemoveCPCommand.java b/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/SdxL2RemoveCPCommand.java
index ec01761..ce2a890 100644
--- a/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/SdxL2RemoveCPCommand.java
+++ b/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/SdxL2RemoveCPCommand.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/SdxL2RemoveCommand.java b/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/SdxL2RemoveCommand.java
index 9f4f715..5ff1cd0 100644
--- a/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/SdxL2RemoveCommand.java
+++ b/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/SdxL2RemoveCommand.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/SdxL2RemoveVCCommand.java b/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/SdxL2RemoveVCCommand.java
index 8f2514b..ed76951 100644
--- a/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/SdxL2RemoveVCCommand.java
+++ b/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/SdxL2RemoveVCCommand.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/completer/MacIdCompleter.java b/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/completer/MacIdCompleter.java
index 9fb2dae..77ce17b 100644
--- a/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/completer/MacIdCompleter.java
+++ b/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/completer/MacIdCompleter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/completer/SdxL2CPNameCompleter.java b/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/completer/SdxL2CPNameCompleter.java
index 8966383..481f8c2 100644
--- a/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/completer/SdxL2CPNameCompleter.java
+++ b/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/completer/SdxL2CPNameCompleter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/completer/SdxL2NameCompleter.java b/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/completer/SdxL2NameCompleter.java
index df31856..fd5d232 100644
--- a/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/completer/SdxL2NameCompleter.java
+++ b/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/completer/SdxL2NameCompleter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/completer/SdxL2VCNameCompleter.java b/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/completer/SdxL2VCNameCompleter.java
index 56c6a26..e2e731c 100644
--- a/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/completer/SdxL2VCNameCompleter.java
+++ b/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/completer/SdxL2VCNameCompleter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/completer/package-info.java b/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/completer/package-info.java
index 753c338..0a71a0f 100644
--- a/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/completer/package-info.java
+++ b/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/completer/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/package-info.java b/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/package-info.java
index b94a3c1..a08e843 100644
--- a/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/package-info.java
+++ b/sdx-l2/src/main/java/org/onosproject/sdxl2/cli/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l2/src/main/java/org/onosproject/sdxl2/package-info.java b/sdx-l2/src/main/java/org/onosproject/sdxl2/package-info.java
index 8d622ca..a4cebd2 100644
--- a/sdx-l2/src/main/java/org/onosproject/sdxl2/package-info.java
+++ b/sdx-l2/src/main/java/org/onosproject/sdxl2/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l2/src/main/resources/OSGI-INF/blueprint/shell-config.xml b/sdx-l2/src/main/resources/OSGI-INF/blueprint/shell-config.xml
index 696cffe..866f473 100644
--- a/sdx-l2/src/main/resources/OSGI-INF/blueprint/shell-config.xml
+++ b/sdx-l2/src/main/resources/OSGI-INF/blueprint/shell-config.xml
@@ -1,5 +1,5 @@
<!--
- ~ Copyright 2016-present Open Networking Laboratory
+ ~ Copyright 2016-present Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/sdx-l2/src/test/java/org/onosproject/sdxl2/IntentServiceTest.java b/sdx-l2/src/test/java/org/onosproject/sdxl2/IntentServiceTest.java
index 83e0c20..db01cf5 100644
--- a/sdx-l2/src/test/java/org/onosproject/sdxl2/IntentServiceTest.java
+++ b/sdx-l2/src/test/java/org/onosproject/sdxl2/IntentServiceTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l2/src/test/java/org/onosproject/sdxl2/SdxL2ConnectionPointTest.java b/sdx-l2/src/test/java/org/onosproject/sdxl2/SdxL2ConnectionPointTest.java
index 8dd0371..916995d 100644
--- a/sdx-l2/src/test/java/org/onosproject/sdxl2/SdxL2ConnectionPointTest.java
+++ b/sdx-l2/src/test/java/org/onosproject/sdxl2/SdxL2ConnectionPointTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l2/src/test/java/org/onosproject/sdxl2/SdxL2MacVCManagerTest.java b/sdx-l2/src/test/java/org/onosproject/sdxl2/SdxL2MacVCManagerTest.java
index a6db1fc..4787928 100644
--- a/sdx-l2/src/test/java/org/onosproject/sdxl2/SdxL2MacVCManagerTest.java
+++ b/sdx-l2/src/test/java/org/onosproject/sdxl2/SdxL2MacVCManagerTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l2/src/test/java/org/onosproject/sdxl2/SdxL2ManagerTest.java b/sdx-l2/src/test/java/org/onosproject/sdxl2/SdxL2ManagerTest.java
index 52b9c03..31d20d0 100644
--- a/sdx-l2/src/test/java/org/onosproject/sdxl2/SdxL2ManagerTest.java
+++ b/sdx-l2/src/test/java/org/onosproject/sdxl2/SdxL2ManagerTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l2/src/test/java/org/onosproject/sdxl2/SdxL2MplsVCManagerTest.java b/sdx-l2/src/test/java/org/onosproject/sdxl2/SdxL2MplsVCManagerTest.java
index 92aa7c6..bc0a725 100644
--- a/sdx-l2/src/test/java/org/onosproject/sdxl2/SdxL2MplsVCManagerTest.java
+++ b/sdx-l2/src/test/java/org/onosproject/sdxl2/SdxL2MplsVCManagerTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l2/src/test/java/org/onosproject/sdxl2/SdxL2VCManagerTest.java b/sdx-l2/src/test/java/org/onosproject/sdxl2/SdxL2VCManagerTest.java
index 4071a96..547d594 100644
--- a/sdx-l2/src/test/java/org/onosproject/sdxl2/SdxL2VCManagerTest.java
+++ b/sdx-l2/src/test/java/org/onosproject/sdxl2/SdxL2VCManagerTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l2/src/test/java/org/onosproject/sdxl2/SdxL2VlanVCManagerTest.java b/sdx-l2/src/test/java/org/onosproject/sdxl2/SdxL2VlanVCManagerTest.java
index bfb1c0b..3b85426 100644
--- a/sdx-l2/src/test/java/org/onosproject/sdxl2/SdxL2VlanVCManagerTest.java
+++ b/sdx-l2/src/test/java/org/onosproject/sdxl2/SdxL2VlanVCManagerTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l2/src/test/java/org/onosproject/sdxl2/VirtualCircuitTest.java b/sdx-l2/src/test/java/org/onosproject/sdxl2/VirtualCircuitTest.java
index 7184d67..6d22831 100644
--- a/sdx-l2/src/test/java/org/onosproject/sdxl2/VirtualCircuitTest.java
+++ b/sdx-l2/src/test/java/org/onosproject/sdxl2/VirtualCircuitTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l3/app.xml b/sdx-l3/app.xml
index 6abd0f5..1a45b23 100644
--- a/sdx-l3/app.xml
+++ b/sdx-l3/app.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright 2016-present Open Networking Laboratory
+ ~ Copyright 2016-present Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/sdx-l3/features.xml b/sdx-l3/features.xml
index 55d5f23..f1e8027 100644
--- a/sdx-l3/features.xml
+++ b/sdx-l3/features.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
- ~ Copyright 2016-present Open Networking Laboratory
+ ~ Copyright 2016-present Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/sdx-l3/pom.xml b/sdx-l3/pom.xml
index e24c59e..77af083 100644
--- a/sdx-l3/pom.xml
+++ b/sdx-l3/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright 2016 - present Open Networking Laboratory
+ ~ Copyright 2016 - present Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/sdx-l3/src/main/java/org/onosproject/sdxl3/SdxL3.java b/sdx-l3/src/main/java/org/onosproject/sdxl3/SdxL3.java
index 4ab2b8f..f7ee1f7 100644
--- a/sdx-l3/src/main/java/org/onosproject/sdxl3/SdxL3.java
+++ b/sdx-l3/src/main/java/org/onosproject/sdxl3/SdxL3.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l3/src/main/java/org/onosproject/sdxl3/SdxL3Fib.java b/sdx-l3/src/main/java/org/onosproject/sdxl3/SdxL3Fib.java
index af22d6a..ca4c7d1 100644
--- a/sdx-l3/src/main/java/org/onosproject/sdxl3/SdxL3Fib.java
+++ b/sdx-l3/src/main/java/org/onosproject/sdxl3/SdxL3Fib.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l3/src/main/java/org/onosproject/sdxl3/SdxL3PeerService.java b/sdx-l3/src/main/java/org/onosproject/sdxl3/SdxL3PeerService.java
index 9b8e2d2..3dd8e87 100644
--- a/sdx-l3/src/main/java/org/onosproject/sdxl3/SdxL3PeerService.java
+++ b/sdx-l3/src/main/java/org/onosproject/sdxl3/SdxL3PeerService.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l3/src/main/java/org/onosproject/sdxl3/cli/AddPeerDetailsCommand.java b/sdx-l3/src/main/java/org/onosproject/sdxl3/cli/AddPeerDetailsCommand.java
index dae6b49..3d99707 100644
--- a/sdx-l3/src/main/java/org/onosproject/sdxl3/cli/AddPeerDetailsCommand.java
+++ b/sdx-l3/src/main/java/org/onosproject/sdxl3/cli/AddPeerDetailsCommand.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l3/src/main/java/org/onosproject/sdxl3/cli/BgpPeersListCommand.java b/sdx-l3/src/main/java/org/onosproject/sdxl3/cli/BgpPeersListCommand.java
index b50c2e2..7172bbe 100644
--- a/sdx-l3/src/main/java/org/onosproject/sdxl3/cli/BgpPeersListCommand.java
+++ b/sdx-l3/src/main/java/org/onosproject/sdxl3/cli/BgpPeersListCommand.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l3/src/main/java/org/onosproject/sdxl3/cli/RemovePeerDetailsCommand.java b/sdx-l3/src/main/java/org/onosproject/sdxl3/cli/RemovePeerDetailsCommand.java
index a8e1bb9..f9bc311 100644
--- a/sdx-l3/src/main/java/org/onosproject/sdxl3/cli/RemovePeerDetailsCommand.java
+++ b/sdx-l3/src/main/java/org/onosproject/sdxl3/cli/RemovePeerDetailsCommand.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l3/src/main/java/org/onosproject/sdxl3/cli/package-info.java b/sdx-l3/src/main/java/org/onosproject/sdxl3/cli/package-info.java
index 0aa9aed..7128587 100644
--- a/sdx-l3/src/main/java/org/onosproject/sdxl3/cli/package-info.java
+++ b/sdx-l3/src/main/java/org/onosproject/sdxl3/cli/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l3/src/main/java/org/onosproject/sdxl3/config/SdxParticipantsConfig.java b/sdx-l3/src/main/java/org/onosproject/sdxl3/config/SdxParticipantsConfig.java
index 6d3dfce..7c9f470 100644
--- a/sdx-l3/src/main/java/org/onosproject/sdxl3/config/SdxParticipantsConfig.java
+++ b/sdx-l3/src/main/java/org/onosproject/sdxl3/config/SdxParticipantsConfig.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l3/src/main/java/org/onosproject/sdxl3/config/package-info.java b/sdx-l3/src/main/java/org/onosproject/sdxl3/config/package-info.java
index a0b9d4d..a3da381 100644
--- a/sdx-l3/src/main/java/org/onosproject/sdxl3/config/package-info.java
+++ b/sdx-l3/src/main/java/org/onosproject/sdxl3/config/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l3/src/main/java/org/onosproject/sdxl3/impl/SdxL3NeighbourHandler.java b/sdx-l3/src/main/java/org/onosproject/sdxl3/impl/SdxL3NeighbourHandler.java
index f038b99..df14bf4 100644
--- a/sdx-l3/src/main/java/org/onosproject/sdxl3/impl/SdxL3NeighbourHandler.java
+++ b/sdx-l3/src/main/java/org/onosproject/sdxl3/impl/SdxL3NeighbourHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l3/src/main/java/org/onosproject/sdxl3/impl/SdxL3PeerManager.java b/sdx-l3/src/main/java/org/onosproject/sdxl3/impl/SdxL3PeerManager.java
index e8b941e..4bd31c2 100644
--- a/sdx-l3/src/main/java/org/onosproject/sdxl3/impl/SdxL3PeerManager.java
+++ b/sdx-l3/src/main/java/org/onosproject/sdxl3/impl/SdxL3PeerManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l3/src/main/java/org/onosproject/sdxl3/impl/package-info.java b/sdx-l3/src/main/java/org/onosproject/sdxl3/impl/package-info.java
index 590cf39..c7d5a4b 100644
--- a/sdx-l3/src/main/java/org/onosproject/sdxl3/impl/package-info.java
+++ b/sdx-l3/src/main/java/org/onosproject/sdxl3/impl/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l3/src/main/java/org/onosproject/sdxl3/package-info.java b/sdx-l3/src/main/java/org/onosproject/sdxl3/package-info.java
index 6869796..6e81c23 100644
--- a/sdx-l3/src/main/java/org/onosproject/sdxl3/package-info.java
+++ b/sdx-l3/src/main/java/org/onosproject/sdxl3/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l3/src/main/resources/OSGI-INF/blueprint/shell-config.xml b/sdx-l3/src/main/resources/OSGI-INF/blueprint/shell-config.xml
index 6c3a84d..1b9efe0 100644
--- a/sdx-l3/src/main/resources/OSGI-INF/blueprint/shell-config.xml
+++ b/sdx-l3/src/main/resources/OSGI-INF/blueprint/shell-config.xml
@@ -1,5 +1,5 @@
<!--
- ~ Copyright 2016-present Open Networking Laboratory
+ ~ Copyright 2016-present Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/sdx-l3/src/test/java/org/onosproject/sdxl3/SdxL3FibTest.java b/sdx-l3/src/test/java/org/onosproject/sdxl3/SdxL3FibTest.java
index 8036a34..bf4936a 100644
--- a/sdx-l3/src/test/java/org/onosproject/sdxl3/SdxL3FibTest.java
+++ b/sdx-l3/src/test/java/org/onosproject/sdxl3/SdxL3FibTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l3/src/test/java/org/onosproject/sdxl3/config/SdxParticipantsConfigTest.java b/sdx-l3/src/test/java/org/onosproject/sdxl3/config/SdxParticipantsConfigTest.java
index 8dedc82..9ee006c 100644
--- a/sdx-l3/src/test/java/org/onosproject/sdxl3/config/SdxParticipantsConfigTest.java
+++ b/sdx-l3/src/test/java/org/onosproject/sdxl3/config/SdxParticipantsConfigTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l3/src/test/java/org/onosproject/sdxl3/impl/SdxL3PeerAdministrationTest.java b/sdx-l3/src/test/java/org/onosproject/sdxl3/impl/SdxL3PeerAdministrationTest.java
index fc96f88..8b160b6 100644
--- a/sdx-l3/src/test/java/org/onosproject/sdxl3/impl/SdxL3PeerAdministrationTest.java
+++ b/sdx-l3/src/test/java/org/onosproject/sdxl3/impl/SdxL3PeerAdministrationTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/sdx-l3/src/test/java/org/onosproject/sdxl3/impl/SdxL3PeerConnectivityTest.java b/sdx-l3/src/test/java/org/onosproject/sdxl3/impl/SdxL3PeerConnectivityTest.java
index 0bd4aec..2d88b31 100644
--- a/sdx-l3/src/test/java/org/onosproject/sdxl3/impl/SdxL3PeerConnectivityTest.java
+++ b/sdx-l3/src/test/java/org/onosproject/sdxl3/impl/SdxL3PeerConnectivityTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Laboratory
+ * Copyright 2016-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/tvue/features.xml b/tvue/features.xml
index f6ef861..8f9f36d 100644
--- a/tvue/features.xml
+++ b/tvue/features.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
- ~ Copyright 2015 Open Networking Laboratory
+ ~ Copyright 2015 Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/tvue/pom.xml b/tvue/pom.xml
index 8b2c990..9a0a284 100644
--- a/tvue/pom.xml
+++ b/tvue/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright 2014-2016 Open Networking Laboratory
+ ~ Copyright 2014-2016 Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/tvue/src/main/java/org/onosproject/tvue/TopologyResource.java b/tvue/src/main/java/org/onosproject/tvue/TopologyResource.java
index b8a68c9..c9746bd 100644
--- a/tvue/src/main/java/org/onosproject/tvue/TopologyResource.java
+++ b/tvue/src/main/java/org/onosproject/tvue/TopologyResource.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2014 Open Networking Laboratory
+ * Copyright 2014 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/tvue/src/main/java/org/onosproject/tvue/package-info.java b/tvue/src/main/java/org/onosproject/tvue/package-info.java
index f04e0f6..c63df7f 100644
--- a/tvue/src/main/java/org/onosproject/tvue/package-info.java
+++ b/tvue/src/main/java/org/onosproject/tvue/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2014 Open Networking Laboratory
+ * Copyright 2014 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/tvue/src/main/webapp/WEB-INF/web.xml b/tvue/src/main/webapp/WEB-INF/web.xml
index 4ffeb26..7d6daa7 100644
--- a/tvue/src/main/webapp/WEB-INF/web.xml
+++ b/tvue/src/main/webapp/WEB-INF/web.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright 2014 Open Networking Laboratory
+ ~ Copyright 2014 Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/tvue/src/main/webapp/index.html b/tvue/src/main/webapp/index.html
index 15f7c20..223ef07 100644
--- a/tvue/src/main/webapp/index.html
+++ b/tvue/src/main/webapp/index.html
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<!--
- ~ Copyright 2014 Open Networking Laboratory
+ ~ Copyright 2014 Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/tvue/src/main/webapp/libs/d3.v3.min.js b/tvue/src/main/webapp/libs/d3.v3.min.js
index d314f4d..6bab293 100644
--- a/tvue/src/main/webapp/libs/d3.v3.min.js
+++ b/tvue/src/main/webapp/libs/d3.v3.min.js
@@ -1,5 +1,5 @@
/*
- * Copyright 2014 Open Networking Laboratory
+ * Copyright 2014 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/tvue/src/main/webapp/libs/jquery-1.11.1.min.js b/tvue/src/main/webapp/libs/jquery-1.11.1.min.js
index 8e15394..fe2b93c 100644
--- a/tvue/src/main/webapp/libs/jquery-1.11.1.min.js
+++ b/tvue/src/main/webapp/libs/jquery-1.11.1.min.js
@@ -1,5 +1,5 @@
/*
- * Copyright 2014 Open Networking Laboratory
+ * Copyright 2014 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/uiref/app.xml b/uiref/app.xml
index 900eb1c..80ca0cf 100644
--- a/uiref/app.xml
+++ b/uiref/app.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright 2016 Open Networking Laboratory
+ ~ Copyright 2016 Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/uiref/pom.xml b/uiref/pom.xml
index b5a3616..1959478 100644
--- a/uiref/pom.xml
+++ b/uiref/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright 2015 Open Networking Laboratory
+ ~ Copyright 2015 Open Networking Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
diff --git a/uiref/src/main/java/org/onosproject/uiref/DemoLink.java b/uiref/src/main/java/org/onosproject/uiref/DemoLink.java
index 54e9234..f47211f 100644
--- a/uiref/src/main/java/org/onosproject/uiref/DemoLink.java
+++ b/uiref/src/main/java/org/onosproject/uiref/DemoLink.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/uiref/src/main/java/org/onosproject/uiref/DemoLinkMap.java b/uiref/src/main/java/org/onosproject/uiref/DemoLinkMap.java
index 754a735..22cd8c0 100644
--- a/uiref/src/main/java/org/onosproject/uiref/DemoLinkMap.java
+++ b/uiref/src/main/java/org/onosproject/uiref/DemoLinkMap.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/uiref/src/main/java/org/onosproject/uiref/UiRefComponent.java b/uiref/src/main/java/org/onosproject/uiref/UiRefComponent.java
index 9e5179b..928df52 100644
--- a/uiref/src/main/java/org/onosproject/uiref/UiRefComponent.java
+++ b/uiref/src/main/java/org/onosproject/uiref/UiRefComponent.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/uiref/src/main/java/org/onosproject/uiref/UiRefCustomViewMessageHandler.java b/uiref/src/main/java/org/onosproject/uiref/UiRefCustomViewMessageHandler.java
index 6cf7be1..0a74b99 100644
--- a/uiref/src/main/java/org/onosproject/uiref/UiRefCustomViewMessageHandler.java
+++ b/uiref/src/main/java/org/onosproject/uiref/UiRefCustomViewMessageHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/uiref/src/main/java/org/onosproject/uiref/UiRefTableViewMessageHandler.java b/uiref/src/main/java/org/onosproject/uiref/UiRefTableViewMessageHandler.java
index dd0b9fd..a80154f 100644
--- a/uiref/src/main/java/org/onosproject/uiref/UiRefTableViewMessageHandler.java
+++ b/uiref/src/main/java/org/onosproject/uiref/UiRefTableViewMessageHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/uiref/src/main/java/org/onosproject/uiref/UiRefTopoOverlay.java b/uiref/src/main/java/org/onosproject/uiref/UiRefTopoOverlay.java
index a2246b9..aee9762 100644
--- a/uiref/src/main/java/org/onosproject/uiref/UiRefTopoOverlay.java
+++ b/uiref/src/main/java/org/onosproject/uiref/UiRefTopoOverlay.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/uiref/src/main/java/org/onosproject/uiref/UiRefTopoOverlayMessageHandler.java b/uiref/src/main/java/org/onosproject/uiref/UiRefTopoOverlayMessageHandler.java
index 017bcb3..cf18d94 100644
--- a/uiref/src/main/java/org/onosproject/uiref/UiRefTopoOverlayMessageHandler.java
+++ b/uiref/src/main/java/org/onosproject/uiref/UiRefTopoOverlayMessageHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/uiref/src/main/java/org/onosproject/uiref/package-info.java b/uiref/src/main/java/org/onosproject/uiref/package-info.java
index 232dc2c..0726e97 100644
--- a/uiref/src/main/java/org/onosproject/uiref/package-info.java
+++ b/uiref/src/main/java/org/onosproject/uiref/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/uiref/src/main/resources/app/view/uiRefExtra/uiRefExtra.js b/uiref/src/main/resources/app/view/uiRefExtra/uiRefExtra.js
index d7d2cf0..be5e786 100644
--- a/uiref/src/main/resources/app/view/uiRefExtra/uiRefExtra.js
+++ b/uiref/src/main/resources/app/view/uiRefExtra/uiRefExtra.js
@@ -1,5 +1,5 @@
/*
- * Copyright 2016 Open Networking Laboratory
+ * Copyright 2016 Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.