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/automation/Dockerfile.automation b/automation/Dockerfile.automation
index 856c19f..63dd43f 100644
--- a/automation/Dockerfile.automation
+++ b/automation/Dockerfile.automation
@@ -1,4 +1,4 @@
-## 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/automation/maas-flow.go b/automation/maas-flow.go
index e4dc44a..02ccd8c 100644
--- a/automation/maas-flow.go
+++ b/automation/maas-flow.go
@@ -1,4 +1,4 @@
-// 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/automation/node.go b/automation/node.go
index 29084f9..99d1408 100644
--- a/automation/node.go
+++ b/automation/node.go
@@ -1,4 +1,4 @@
-// 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/automation/provisioner_api.go b/automation/provisioner_api.go
index 2f2fd26..dd38755 100644
--- a/automation/provisioner_api.go
+++ b/automation/provisioner_api.go
@@ -1,4 +1,4 @@
-// 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/automation/state.go b/automation/state.go
index d4d095b..8a2116f 100644
--- a/automation/state.go
+++ b/automation/state.go
@@ -1,4 +1,4 @@
-// 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/config-generator/Dockerfile.generator b/config-generator/Dockerfile.generator
index 45ab66f..8cbc55b 100644
--- a/config-generator/Dockerfile.generator
+++ b/config-generator/Dockerfile.generator
@@ -1,4 +1,4 @@
-## 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/config-generator/configGen.go b/config-generator/configGen.go
index 063e46e..8aac57e 100644
--- a/config-generator/configGen.go
+++ b/config-generator/configGen.go
@@ -1,4 +1,4 @@
-// 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/config-generator/handlers.go b/config-generator/handlers.go
index eabdbe3..dc5b34b 100644
--- a/config-generator/handlers.go
+++ b/config-generator/handlers.go
@@ -1,4 +1,4 @@
-// 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/config-generator/onos_types.go b/config-generator/onos_types.go
index b5d3c59..be3de81 100644
--- a/config-generator/onos_types.go
+++ b/config-generator/onos_types.go
@@ -1,4 +1,4 @@
-// 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/harvester/Dockerfile.harvester b/harvester/Dockerfile.harvester
index 1d14e61..6dfd06d 100644
--- a/harvester/Dockerfile.harvester
+++ b/harvester/Dockerfile.harvester
@@ -1,4 +1,4 @@
-## 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/harvester/handlers.go b/harvester/handlers.go
index 56316eb..b23a64c 100644
--- a/harvester/handlers.go
+++ b/harvester/handlers.go
@@ -1,4 +1,4 @@
-// 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/harvester/harvester.go b/harvester/harvester.go
index 3a16817..3a3dbf1 100644
--- a/harvester/harvester.go
+++ b/harvester/harvester.go
@@ -1,4 +1,4 @@
-// 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/harvester/lease.go b/harvester/lease.go
index 109f5cc..a2a8db8 100644
--- a/harvester/lease.go
+++ b/harvester/lease.go
@@ -1,4 +1,4 @@
-// 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/harvester/parse.go b/harvester/parse.go
index 059bf8e..4bfe195 100644
--- a/harvester/parse.go
+++ b/harvester/parse.go
@@ -1,4 +1,4 @@
-// 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/harvester/verify.go b/harvester/verify.go
index 22ae332..f4829bf 100644
--- a/harvester/verify.go
+++ b/harvester/verify.go
@@ -1,4 +1,4 @@
-// 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/ip-allocator/Dockerfile.allocator b/ip-allocator/Dockerfile.allocator
index 9108ffa..3c206f4 100644
--- a/ip-allocator/Dockerfile.allocator
+++ b/ip-allocator/Dockerfile.allocator
@@ -1,4 +1,4 @@
-## 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/ip-allocator/allocate.go b/ip-allocator/allocate.go
index 13b21ed..1c32064 100644
--- a/ip-allocator/allocate.go
+++ b/ip-allocator/allocate.go
@@ -1,4 +1,4 @@
-// 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/ip-allocator/allocator.go b/ip-allocator/allocator.go
index 590585b..f9387c0 100644
--- a/ip-allocator/allocator.go
+++ b/ip-allocator/allocator.go
@@ -1,4 +1,4 @@
-// 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/ip-allocator/handlers.go b/ip-allocator/handlers.go
index 9129e4c..0c0b008 100644
--- a/ip-allocator/handlers.go
+++ b/ip-allocator/handlers.go
@@ -1,4 +1,4 @@
-// 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/ip-allocator/ip.go b/ip-allocator/ip.go
index fb85def..869d266 100644
--- a/ip-allocator/ip.go
+++ b/ip-allocator/ip.go
@@ -1,4 +1,4 @@
-// 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/ip-allocator/storage.go b/ip-allocator/storage.go
index 0832558..291a999 100644
--- a/ip-allocator/storage.go
+++ b/ip-allocator/storage.go
@@ -1,4 +1,4 @@
-// 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/provisioner/Dockerfile.provisioner b/provisioner/Dockerfile.provisioner
index e3be840..814a5f9 100644
--- a/provisioner/Dockerfile.provisioner
+++ b/provisioner/Dockerfile.provisioner
@@ -1,4 +1,4 @@
-## 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/provisioner/consul_storage.go b/provisioner/consul_storage.go
index 7f8f8d0..c77121d 100644
--- a/provisioner/consul_storage.go
+++ b/provisioner/consul_storage.go
@@ -1,4 +1,4 @@
-// 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/provisioner/dispatcher.go b/provisioner/dispatcher.go
index 297d43b..29c4460 100644
--- a/provisioner/dispatcher.go
+++ b/provisioner/dispatcher.go
@@ -1,4 +1,4 @@
-// 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/provisioner/handlers.go b/provisioner/handlers.go
index fd3c654..7d2632d 100644
--- a/provisioner/handlers.go
+++ b/provisioner/handlers.go
@@ -1,4 +1,4 @@
-// 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/provisioner/provisioner.go b/provisioner/provisioner.go
index e949895..049de2d 100644
--- a/provisioner/provisioner.go
+++ b/provisioner/provisioner.go
@@ -1,4 +1,4 @@
-// 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/provisioner/storage.go b/provisioner/storage.go
index 15fc390..19bfb47 100644
--- a/provisioner/storage.go
+++ b/provisioner/storage.go
@@ -1,4 +1,4 @@
-// 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/provisioner/task.go b/provisioner/task.go
index 4694849..0951c7d 100644
--- a/provisioner/task.go
+++ b/provisioner/task.go
@@ -1,4 +1,4 @@
-// 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/switchq/Dockerfile.switchq b/switchq/Dockerfile.switchq
index 48529ec..e139be8 100644
--- a/switchq/Dockerfile.switchq
+++ b/switchq/Dockerfile.switchq
@@ -1,4 +1,4 @@
-## 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/switchq/address.go b/switchq/address.go
index 081afe8..27e0957 100644
--- a/switchq/address.go
+++ b/switchq/address.go
@@ -1,4 +1,4 @@
-// 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/switchq/handlers.go b/switchq/handlers.go
index 3e302bd..fff86df 100644
--- a/switchq/handlers.go
+++ b/switchq/handlers.go
@@ -1,4 +1,4 @@
-// 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/switchq/switchq.go b/switchq/switchq.go
index 1941236..c2adab2 100644
--- a/switchq/switchq.go
+++ b/switchq/switchq.go
@@ -1,4 +1,4 @@
-// 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/switchq/sync.go b/switchq/sync.go
index 64b0d43..4452c6f 100644
--- a/switchq/sync.go
+++ b/switchq/sync.go
@@ -1,4 +1,4 @@
-// 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/switchq/vendors.go b/switchq/vendors.go
index 4af0c30..96f4af6 100644
--- a/switchq/vendors.go
+++ b/switchq/vendors.go
@@ -1,4 +1,4 @@
-// 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.