diff --git a/core/api/src/main/java/org/onosproject/core/Application.java b/core/api/src/main/java/org/onosproject/core/Application.java
index dca99c2..b898cb6 100644
--- a/core/api/src/main/java/org/onosproject/core/Application.java
+++ b/core/api/src/main/java/org/onosproject/core/Application.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-present Open Networking Laboratory
+ * Copyright 2015-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/core/api/src/main/java/org/onosproject/core/ApplicationId.java b/core/api/src/main/java/org/onosproject/core/ApplicationId.java
index b15c9c8..793816c 100644
--- a/core/api/src/main/java/org/onosproject/core/ApplicationId.java
+++ b/core/api/src/main/java/org/onosproject/core/ApplicationId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-present Open Networking Laboratory
+ * Copyright 2014-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/core/api/src/main/java/org/onosproject/core/ApplicationRole.java b/core/api/src/main/java/org/onosproject/core/ApplicationRole.java
index 73685b5c..2927a3a 100644
--- a/core/api/src/main/java/org/onosproject/core/ApplicationRole.java
+++ b/core/api/src/main/java/org/onosproject/core/ApplicationRole.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-present Open Networking Laboratory
+ * Copyright 2015-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/core/api/src/main/java/org/onosproject/core/CoreService.java b/core/api/src/main/java/org/onosproject/core/CoreService.java
index d7760f3..82fce4c 100644
--- a/core/api/src/main/java/org/onosproject/core/CoreService.java
+++ b/core/api/src/main/java/org/onosproject/core/CoreService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-present Open Networking Laboratory
+ * Copyright 2014-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/core/api/src/main/java/org/onosproject/core/DefaultApplication.java b/core/api/src/main/java/org/onosproject/core/DefaultApplication.java
index e5feae1..f780623 100644
--- a/core/api/src/main/java/org/onosproject/core/DefaultApplication.java
+++ b/core/api/src/main/java/org/onosproject/core/DefaultApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-present Open Networking Laboratory
+ * Copyright 2015-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/core/api/src/main/java/org/onosproject/core/DefaultApplicationId.java b/core/api/src/main/java/org/onosproject/core/DefaultApplicationId.java
index 71e3a3a..a13f7e6 100644
--- a/core/api/src/main/java/org/onosproject/core/DefaultApplicationId.java
+++ b/core/api/src/main/java/org/onosproject/core/DefaultApplicationId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-present Open Networking Laboratory
+ * Copyright 2014-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/core/api/src/main/java/org/onosproject/core/GroupId.java b/core/api/src/main/java/org/onosproject/core/GroupId.java
index c2a9d26..4c372f3 100644
--- a/core/api/src/main/java/org/onosproject/core/GroupId.java
+++ b/core/api/src/main/java/org/onosproject/core/GroupId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-present Open Networking Laboratory
+ * Copyright 2014-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/core/api/src/main/java/org/onosproject/core/HybridLogicalClockService.java b/core/api/src/main/java/org/onosproject/core/HybridLogicalClockService.java
index 57102b0..5ef8c32 100644
--- a/core/api/src/main/java/org/onosproject/core/HybridLogicalClockService.java
+++ b/core/api/src/main/java/org/onosproject/core/HybridLogicalClockService.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/core/api/src/main/java/org/onosproject/core/HybridLogicalTime.java b/core/api/src/main/java/org/onosproject/core/HybridLogicalTime.java
index 154ea73..682d0ae 100644
--- a/core/api/src/main/java/org/onosproject/core/HybridLogicalTime.java
+++ b/core/api/src/main/java/org/onosproject/core/HybridLogicalTime.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/core/api/src/main/java/org/onosproject/core/IdBlock.java b/core/api/src/main/java/org/onosproject/core/IdBlock.java
index 6788b08..4e68b4b 100644
--- a/core/api/src/main/java/org/onosproject/core/IdBlock.java
+++ b/core/api/src/main/java/org/onosproject/core/IdBlock.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-present Open Networking Laboratory
+ * Copyright 2014-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/core/api/src/main/java/org/onosproject/core/IdBlockStore.java b/core/api/src/main/java/org/onosproject/core/IdBlockStore.java
index 2dcbdf7..1f66fe9 100644
--- a/core/api/src/main/java/org/onosproject/core/IdBlockStore.java
+++ b/core/api/src/main/java/org/onosproject/core/IdBlockStore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-present Open Networking Laboratory
+ * Copyright 2014-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/core/api/src/main/java/org/onosproject/core/IdGenerator.java b/core/api/src/main/java/org/onosproject/core/IdGenerator.java
index 4214581..30bd24d 100644
--- a/core/api/src/main/java/org/onosproject/core/IdGenerator.java
+++ b/core/api/src/main/java/org/onosproject/core/IdGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-present Open Networking Laboratory
+ * Copyright 2014-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/core/api/src/main/java/org/onosproject/core/MetricsHelper.java b/core/api/src/main/java/org/onosproject/core/MetricsHelper.java
index 6a3ed38..0130f65 100644
--- a/core/api/src/main/java/org/onosproject/core/MetricsHelper.java
+++ b/core/api/src/main/java/org/onosproject/core/MetricsHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-present Open Networking Laboratory
+ * Copyright 2014-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/core/api/src/main/java/org/onosproject/core/UnavailableIdException.java b/core/api/src/main/java/org/onosproject/core/UnavailableIdException.java
index 0f3e072..3162307 100644
--- a/core/api/src/main/java/org/onosproject/core/UnavailableIdException.java
+++ b/core/api/src/main/java/org/onosproject/core/UnavailableIdException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-present Open Networking Laboratory
+ * Copyright 2014-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/core/api/src/main/java/org/onosproject/core/Version.java b/core/api/src/main/java/org/onosproject/core/Version.java
index aa2b41e..a5cad64 100644
--- a/core/api/src/main/java/org/onosproject/core/Version.java
+++ b/core/api/src/main/java/org/onosproject/core/Version.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-present Open Networking Laboratory
+ * Copyright 2014-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/core/api/src/main/java/org/onosproject/core/VersionService.java b/core/api/src/main/java/org/onosproject/core/VersionService.java
index 409ffbe..f086faf 100644
--- a/core/api/src/main/java/org/onosproject/core/VersionService.java
+++ b/core/api/src/main/java/org/onosproject/core/VersionService.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/core/api/src/main/java/org/onosproject/core/package-info.java b/core/api/src/main/java/org/onosproject/core/package-info.java
index c5c2801..e0d60e9 100644
--- a/core/api/src/main/java/org/onosproject/core/package-info.java
+++ b/core/api/src/main/java/org/onosproject/core/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-present Open Networking Laboratory
+ * Copyright 2014-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.