diff --git a/demo_test/functional_test/Makefile b/demo_test/functional_test/Makefile
index 1b5ea3b..5cd57f7 100644
--- a/demo_test/functional_test/Makefile
+++ b/demo_test/functional_test/Makefile
@@ -1,4 +1,5 @@
 # Copyright 2018-present Open Networking Foundation
+# Copyright 2018-present Edgecore Networks Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/demo_test/functional_test/README b/demo_test/functional_test/README
index daba620..9b4169d 100644
--- a/demo_test/functional_test/README
+++ b/demo_test/functional_test/README
@@ -1,4 +1,5 @@
-// Copyright 2018 Open Networking Foundation
+// Copyright 2018-present Open Networking Foundation
+// Copyright 2018-present Edgecore Networks Corporation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/demo_test/functional_test/importer.robot b/demo_test/functional_test/importer.robot
index 389028b..516a51e 100644
--- a/demo_test/functional_test/importer.robot
+++ b/demo_test/functional_test/importer.robot
@@ -1,4 +1,5 @@
-# Copyright 2018 Open Networking Foundation
+# Copyright 2018-present Open Networking Foundation
+# Copyright 2018-present Edgecore Networks Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/demo_test/functional_test/robot-mock-olt.yaml b/demo_test/functional_test/robot-mock-olt.yaml
index 9daea3a..e91d76c 100644
--- a/demo_test/functional_test/robot-mock-olt.yaml
+++ b/demo_test/functional_test/robot-mock-olt.yaml
@@ -1,6 +1,7 @@
 ---
 
-# Copyright 2017-present Open Networking Foundation
+# Copyright 2018-present Open Networking Foundation
+# Copyright 2018-present Edgecore Networks Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/demo_test/functional_test/test_cli.go b/demo_test/functional_test/test_cli.go
index 81cfe07..392ccfb 100644
--- a/demo_test/functional_test/test_cli.go
+++ b/demo_test/functional_test/test_cli.go
@@ -1,4 +1,5 @@
 // Copyright 2018-present Open Networking Foundation
+// Copyright 2018-present Edgecore Networks Corporation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/demo_test/functional_test/tests/add_device_to_monitor.expected b/demo_test/functional_test/tests/add_device_to_monitor.expected
index 64812fb..52a9dc5 100644
--- a/demo_test/functional_test/tests/add_device_to_monitor.expected
+++ b/demo_test/functional_test/tests/add_device_to_monitor.expected
@@ -1,4 +1,5 @@
-// Copyright 2018 Open Networking Foundation
+// Copyright 2018-present Open Networking Foundation
+// Copyright 2018-present Edgecore Networks Corporation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/demo_test/functional_test/tests/add_device_to_monitor.tc b/demo_test/functional_test/tests/add_device_to_monitor.tc
index 4584e81..ca070a6 100755
--- a/demo_test/functional_test/tests/add_device_to_monitor.tc
+++ b/demo_test/functional_test/tests/add_device_to_monitor.tc
@@ -1,6 +1,8 @@
 #!/bin/bash  
 
-# Copyrigh/ 2019-present Open Networking Foundation
+# Copyright 2018-present Open Networking Foundation
+# Copyright 2018-present Edgecore Networks Corporation
+
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/demo_test/functional_test/tests/clear_all_subscribed_events.expected b/demo_test/functional_test/tests/clear_all_subscribed_events.expected
index f05a3fd..ae8f5b4 100644
--- a/demo_test/functional_test/tests/clear_all_subscribed_events.expected
+++ b/demo_test/functional_test/tests/clear_all_subscribed_events.expected
@@ -1,4 +1,5 @@
-// Copyright 2018 Open Networking Foundation
+// Copyright 2018-present Open Networking Foundation
+// Copyright 2018-present Edgecore Networks Corporation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/demo_test/functional_test/tests/clear_all_subscribed_events.tc b/demo_test/functional_test/tests/clear_all_subscribed_events.tc
index b88f318..559083f 100755
--- a/demo_test/functional_test/tests/clear_all_subscribed_events.tc
+++ b/demo_test/functional_test/tests/clear_all_subscribed_events.tc
@@ -1,6 +1,7 @@
 #!/bin/bash  
 
-# Copyrigh/ 2019-present Open Networking Foundation
+# Copyright 2018-present Open Networking Foundation
+# Copyright 2018-present Edgecore Networks Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/demo_test/functional_test/tests/configure_data_polling_interval.expected b/demo_test/functional_test/tests/configure_data_polling_interval.expected
index 66e93bb..99ba02a 100644
--- a/demo_test/functional_test/tests/configure_data_polling_interval.expected
+++ b/demo_test/functional_test/tests/configure_data_polling_interval.expected
@@ -1,4 +1,5 @@
-// Copyright 2018 Open Networking Foundation
+// Copyright 2018-present Open Networking Foundation
+// Copyright 2018-present Edgecore Networks Corporation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/demo_test/functional_test/tests/configure_data_polling_interval.tc b/demo_test/functional_test/tests/configure_data_polling_interval.tc
index 01202ce..5403523 100755
--- a/demo_test/functional_test/tests/configure_data_polling_interval.tc
+++ b/demo_test/functional_test/tests/configure_data_polling_interval.tc
@@ -1,6 +1,7 @@
 #!/bin/bash  
 
-# Copyrigh/ 2019-present Open Networking Foundation
+# Copyright 2018-present Open Networking Foundation
+# Copyright 2018-present Edgecore Networks Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/demo_test/functional_test/tests/delete_monitored_device.expected b/demo_test/functional_test/tests/delete_monitored_device.expected
index 65763d9..f4541cf 100644
--- a/demo_test/functional_test/tests/delete_monitored_device.expected
+++ b/demo_test/functional_test/tests/delete_monitored_device.expected
@@ -1,4 +1,5 @@
-// Copyright 2018 Open Networking Foundation
+// Copyright 2018-present Open Networking Foundation
+// Copyright 2018-present Edgecore Networks Corporation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/demo_test/functional_test/tests/delete_monitored_device.tc b/demo_test/functional_test/tests/delete_monitored_device.tc
index 7c99273..61d8b0e 100755
--- a/demo_test/functional_test/tests/delete_monitored_device.tc
+++ b/demo_test/functional_test/tests/delete_monitored_device.tc
@@ -1,6 +1,8 @@
 #!/bin/bash  
 
-# Copyrigh/ 2019-present Open Networking Foundation
+# Copyright 2018-present Open Networking Foundation
+# Copyright 2018-present Edgecore Networks Corporation
+
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/demo_test/functional_test/tests/list_device_monitored.expected b/demo_test/functional_test/tests/list_device_monitored.expected
index 4acf927..53623aa 100644
--- a/demo_test/functional_test/tests/list_device_monitored.expected
+++ b/demo_test/functional_test/tests/list_device_monitored.expected
@@ -1,4 +1,5 @@
-// Copyright 2018 Open Networking Foundation
+// Copyright 2018-present Open Networking Foundation
+// Copyright 2018-present Edgecore Networks Corporation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/demo_test/functional_test/tests/list_device_monitored.tc b/demo_test/functional_test/tests/list_device_monitored.tc
index 5e4bc01..3ceb2b2 100755
--- a/demo_test/functional_test/tests/list_device_monitored.tc
+++ b/demo_test/functional_test/tests/list_device_monitored.tc
@@ -1,6 +1,7 @@
 #!/bin/bash  
 
-# Copyrigh/ 2019-present Open Networking Foundation
+# Copyright 2018-present Open Networking Foundation
+# Copyright 2018-present Edgecore Networks Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/demo_test/functional_test/tests/list_subscribed_events.expected b/demo_test/functional_test/tests/list_subscribed_events.expected
index 0b07d01..f0c4280 100644
--- a/demo_test/functional_test/tests/list_subscribed_events.expected
+++ b/demo_test/functional_test/tests/list_subscribed_events.expected
@@ -1,4 +1,5 @@
-// Copyright 2018 Open Networking Foundation
+// Copyright 2018-present Open Networking Foundation
+// Copyright 2018-present Edgecore Networks Corporation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/demo_test/functional_test/tests/list_subscribed_events.tc b/demo_test/functional_test/tests/list_subscribed_events.tc
index 47f47e4..1dcb979 100755
--- a/demo_test/functional_test/tests/list_subscribed_events.tc
+++ b/demo_test/functional_test/tests/list_subscribed_events.tc
@@ -1,6 +1,7 @@
 #!/bin/bash  
 
-# Copyrigh/ 2019-present Open Networking Foundation
+# Copyright 2018-present Open Networking Foundation
+# Copyright 2018-present Edgecore Networks Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/demo_test/functional_test/tests/list_supported_events.expected b/demo_test/functional_test/tests/list_supported_events.expected
index 0b07d01..f0c4280 100644
--- a/demo_test/functional_test/tests/list_supported_events.expected
+++ b/demo_test/functional_test/tests/list_supported_events.expected
@@ -1,4 +1,5 @@
-// Copyright 2018 Open Networking Foundation
+// Copyright 2018-present Open Networking Foundation
+// Copyright 2018-present Edgecore Networks Corporation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/demo_test/functional_test/tests/list_supported_events.tc b/demo_test/functional_test/tests/list_supported_events.tc
index 8f23e06..1b3e4a4 100755
--- a/demo_test/functional_test/tests/list_supported_events.tc
+++ b/demo_test/functional_test/tests/list_supported_events.tc
@@ -1,6 +1,7 @@
 #!/bin/bash  
 
-# Copyrigh/ 2019-present Open Networking Foundation
+# Copyright 2018-present Open Networking Foundation
+# Copyright 2018-present Edgecore Networks Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/demo_test/functional_test/tests/subscribe_events.expected b/demo_test/functional_test/tests/subscribe_events.expected
index 1778144..5e70409 100644
--- a/demo_test/functional_test/tests/subscribe_events.expected
+++ b/demo_test/functional_test/tests/subscribe_events.expected
@@ -1,4 +1,5 @@
-// Copyright 2018 Open Networking Foundation
+// Copyright 2018-present Open Networking Foundation
+// Copyright 2018-present Edgecore Networks Corporation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/demo_test/functional_test/tests/subscribe_events.tc b/demo_test/functional_test/tests/subscribe_events.tc
index ef108e9..cc607cb 100755
--- a/demo_test/functional_test/tests/subscribe_events.tc
+++ b/demo_test/functional_test/tests/subscribe_events.tc
@@ -1,6 +1,7 @@
 #!/bin/bash  
 
-# Copyrigh/ 2019-present Open Networking Foundation
+# Copyright 2018-present Open Networking Foundation
+# Copyright 2018-present Edgecore Networks Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/demo_test/functional_test/tests/unsubscribe_events.expected b/demo_test/functional_test/tests/unsubscribe_events.expected
index fd1b1cb..3635676 100644
--- a/demo_test/functional_test/tests/unsubscribe_events.expected
+++ b/demo_test/functional_test/tests/unsubscribe_events.expected
@@ -1,4 +1,5 @@
-// Copyright 2018 Open Networking Foundation
+// Copyright 2018-present Open Networking Foundation
+// Copyright 2018-present Edgecore Networks Corporation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/demo_test/functional_test/tests/unsubscribe_events.tc b/demo_test/functional_test/tests/unsubscribe_events.tc
index 96d069a..5a57434 100755
--- a/demo_test/functional_test/tests/unsubscribe_events.tc
+++ b/demo_test/functional_test/tests/unsubscribe_events.tc
@@ -1,6 +1,7 @@
 #!/bin/bash  
 
-# Copyrigh/ 2019-present Open Networking Foundation
+# Copyright 2018-present Open Networking Foundation
+# Copyright 2018-present Edgecore Networks Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/demo_test/functional_test/tests/validate_ip.expected b/demo_test/functional_test/tests/validate_ip.expected
index d4f0fc3..0a1961c 100644
--- a/demo_test/functional_test/tests/validate_ip.expected
+++ b/demo_test/functional_test/tests/validate_ip.expected
@@ -1,4 +1,5 @@
-// Copyright 2018 Open Networking Foundation
+// Copyright 2018-present Open Networking Foundation
+// Copyright 2018-present Edgecore Networks Corporation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/demo_test/functional_test/tests/validate_ip.tc b/demo_test/functional_test/tests/validate_ip.tc
index de13243..3ea739c 100755
--- a/demo_test/functional_test/tests/validate_ip.tc
+++ b/demo_test/functional_test/tests/validate_ip.tc
@@ -1,6 +1,7 @@
 #!/bin/bash  
 
-# Copyrigh/ 2019-present Open Networking Foundation
+# Copyright 2018-present Open Networking Foundation
+# Copyright 2018-present Edgecore Networks Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.