diff --git a/LICENSE.txt b/LICENSE.txt
index ded4f63..d9d9d30 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   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/pom.xml b/pom.xml
index 8f8fc89..4a989ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ 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/src/main/java/org/opencord/cordconfig/CordConfigEvent.java b/src/main/java/org/opencord/cordconfig/CordConfigEvent.java
index 4181c7d..ac36692 100644
--- a/src/main/java/org/opencord/cordconfig/CordConfigEvent.java
+++ b/src/main/java/org/opencord/cordconfig/CordConfigEvent.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/src/main/java/org/opencord/cordconfig/CordConfigListener.java b/src/main/java/org/opencord/cordconfig/CordConfigListener.java
index 795e2be..de46b78 100644
--- a/src/main/java/org/opencord/cordconfig/CordConfigListener.java
+++ b/src/main/java/org/opencord/cordconfig/CordConfigListener.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/src/main/java/org/opencord/cordconfig/CordConfigManager.java b/src/main/java/org/opencord/cordconfig/CordConfigManager.java
index eed8694..a85f7bb 100644
--- a/src/main/java/org/opencord/cordconfig/CordConfigManager.java
+++ b/src/main/java/org/opencord/cordconfig/CordConfigManager.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/src/main/java/org/opencord/cordconfig/CordConfigService.java b/src/main/java/org/opencord/cordconfig/CordConfigService.java
index 5d17c85..b26e1f3 100644
--- a/src/main/java/org/opencord/cordconfig/CordConfigService.java
+++ b/src/main/java/org/opencord/cordconfig/CordConfigService.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/src/main/java/org/opencord/cordconfig/access/AccessAgentConfig.java b/src/main/java/org/opencord/cordconfig/access/AccessAgentConfig.java
index 4d3150a..a4e80da 100644
--- a/src/main/java/org/opencord/cordconfig/access/AccessAgentConfig.java
+++ b/src/main/java/org/opencord/cordconfig/access/AccessAgentConfig.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/src/main/java/org/opencord/cordconfig/access/AccessAgentData.java b/src/main/java/org/opencord/cordconfig/access/AccessAgentData.java
index 6ac33d2..128352e 100644
--- a/src/main/java/org/opencord/cordconfig/access/AccessAgentData.java
+++ b/src/main/java/org/opencord/cordconfig/access/AccessAgentData.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/src/main/java/org/opencord/cordconfig/access/AccessDeviceConfig.java b/src/main/java/org/opencord/cordconfig/access/AccessDeviceConfig.java
index d627499..7572a2f 100644
--- a/src/main/java/org/opencord/cordconfig/access/AccessDeviceConfig.java
+++ b/src/main/java/org/opencord/cordconfig/access/AccessDeviceConfig.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/src/main/java/org/opencord/cordconfig/access/AccessDeviceData.java b/src/main/java/org/opencord/cordconfig/access/AccessDeviceData.java
index 40326ec..c2f076c 100644
--- a/src/main/java/org/opencord/cordconfig/access/AccessDeviceData.java
+++ b/src/main/java/org/opencord/cordconfig/access/AccessDeviceData.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/src/main/java/org/opencord/cordconfig/access/package-info.java b/src/main/java/org/opencord/cordconfig/access/package-info.java
index 4c0405a..f6dcfd5 100644
--- a/src/main/java/org/opencord/cordconfig/access/package-info.java
+++ b/src/main/java/org/opencord/cordconfig/access/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/src/main/java/org/opencord/cordconfig/package-info.java b/src/main/java/org/opencord/cordconfig/package-info.java
index 3a73a88..1e83454 100644
--- a/src/main/java/org/opencord/cordconfig/package-info.java
+++ b/src/main/java/org/opencord/cordconfig/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.