diff --git a/apps/backend/backend_client.c b/apps/backend/backend_client.c
index 2426eee7..eda51dac 100644
--- a/apps/backend/backend_client.c
+++ b/apps/backend/backend_client.c
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/apps/backend/backend_commit.c b/apps/backend/backend_commit.c
index 5beff810..0d314bee 100644
--- a/apps/backend/backend_commit.c
+++ b/apps/backend/backend_commit.c
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/apps/backend/backend_main.c b/apps/backend/backend_main.c
index 2c091d24..6c016ca3 100644
--- a/apps/backend/backend_main.c
+++ b/apps/backend/backend_main.c
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/apps/backend/backend_plugin.c b/apps/backend/backend_plugin.c
index 04421b88..cea976ab 100644
--- a/apps/backend/backend_plugin.c
+++ b/apps/backend/backend_plugin.c
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/apps/backend/backend_startup.c b/apps/backend/backend_startup.c
index 677926dc..82c07cfd 100644
--- a/apps/backend/backend_startup.c
+++ b/apps/backend/backend_startup.c
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/apps/cli/cli_common.c b/apps/cli/cli_common.c
index 42f7d983..9119e939 100644
--- a/apps/cli/cli_common.c
+++ b/apps/cli/cli_common.c
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/apps/cli/cli_handle.c b/apps/cli/cli_handle.c
index 535327da..70ce3c2d 100644
--- a/apps/cli/cli_handle.c
+++ b/apps/cli/cli_handle.c
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/apps/cli/cli_handle.h b/apps/cli/cli_handle.h
index 50667d4b..20c02321 100644
--- a/apps/cli/cli_handle.h
+++ b/apps/cli/cli_handle.h
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/apps/cli/cli_main.c b/apps/cli/cli_main.c
index 86e29652..58af3741 100644
--- a/apps/cli/cli_main.c
+++ b/apps/cli/cli_main.c
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/apps/cli/cli_plugin.c b/apps/cli/cli_plugin.c
index b9e73c53..de30d708 100644
--- a/apps/cli/cli_plugin.c
+++ b/apps/cli/cli_plugin.c
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/apps/cli/cli_plugin.h b/apps/cli/cli_plugin.h
index 3cb936e1..d911cc4f 100644
--- a/apps/cli/cli_plugin.h
+++ b/apps/cli/cli_plugin.h
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/apps/cli/cli_show.c b/apps/cli/cli_show.c
index 21dc4abe..6d6f9c9f 100644
--- a/apps/cli/cli_show.c
+++ b/apps/cli/cli_show.c
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/apps/netconf/netconf_lib.c b/apps/netconf/netconf_lib.c
index e21507c3..a42dde08 100644
--- a/apps/netconf/netconf_lib.c
+++ b/apps/netconf/netconf_lib.c
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/apps/netconf/netconf_main.c b/apps/netconf/netconf_main.c
index b6d31912..bb3a86f6 100644
--- a/apps/netconf/netconf_main.c
+++ b/apps/netconf/netconf_main.c
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/apps/netconf/netconf_rpc.c b/apps/netconf/netconf_rpc.c
index 20c887c7..39b003c1 100644
--- a/apps/netconf/netconf_rpc.c
+++ b/apps/netconf/netconf_rpc.c
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/apps/restconf/restconf_main.c b/apps/restconf/restconf_main.c
index ed08fd42..a41206ca 100644
--- a/apps/restconf/restconf_main.c
+++ b/apps/restconf/restconf_main.c
@@ -3,7 +3,7 @@
   ***** BEGIN LICENSE BLOCK *****
  
   Copyright (C) 2009-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/apps/restconf/restconf_methods.c b/apps/restconf/restconf_methods.c
index 5635f254..1169566f 100644
--- a/apps/restconf/restconf_methods.c
+++ b/apps/restconf/restconf_methods.c
@@ -3,7 +3,7 @@
   ***** BEGIN LICENSE BLOCK *****
  
   Copyright (C) 2009-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/apps/restconf/restconf_methods_get.c b/apps/restconf/restconf_methods_get.c
index 3c069b14..1376d302 100644
--- a/apps/restconf/restconf_methods_get.c
+++ b/apps/restconf/restconf_methods_get.c
@@ -3,7 +3,7 @@
   ***** BEGIN LICENSE BLOCK *****
  
   Copyright (C) 2009-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/apps/restconf/restconf_methods_post.c b/apps/restconf/restconf_methods_post.c
index 699b5268..5de192d3 100644
--- a/apps/restconf/restconf_methods_post.c
+++ b/apps/restconf/restconf_methods_post.c
@@ -3,7 +3,7 @@
   ***** BEGIN LICENSE BLOCK *****
 
   Copyright (C) 2009-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/docker/main/Dockerfile b/docker/main/Dockerfile
index fe828339..d9ed4b81 100644
--- a/docker/main/Dockerfile
+++ b/docker/main/Dockerfile
@@ -2,7 +2,7 @@
 # ***** BEGIN LICENSE BLOCK *****
 # 
 # Copyright (C) 2017-2019 Olof Hagsand
-# Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+# Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 #
 # This file is part of CLIXON
 #
diff --git a/docker/main/Makefile.in b/docker/main/Makefile.in
index b59ebcc8..fd38c175 100644
--- a/docker/main/Makefile.in
+++ b/docker/main/Makefile.in
@@ -2,7 +2,7 @@
 # ***** BEGIN LICENSE BLOCK *****
 # 
 # Copyright (C) 2017-2019 Olof Hagsand
-# Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+# Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 #
 # This file is part of CLIXON
 #
diff --git a/docker/main/start.sh b/docker/main/start.sh
index 1a89d11e..3cf09c39 100755
--- a/docker/main/start.sh
+++ b/docker/main/start.sh
@@ -2,7 +2,7 @@
 # ***** BEGIN LICENSE BLOCK *****
 # 
 # Copyright (C) 2017-2019 Olof Hagsand
-# Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+# Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 #
 # This file is part of CLIXON
 #
diff --git a/docker/main/startsystem.sh b/docker/main/startsystem.sh
index 5f23fb4d..bf2d9d25 100755
--- a/docker/main/startsystem.sh
+++ b/docker/main/startsystem.sh
@@ -3,7 +3,7 @@
 # ***** BEGIN LICENSE BLOCK *****
 # 
 # Copyright (C) 2017-2019 Olof Hagsand
-# Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+# Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 #
 # This file is part of CLIXON
 #
diff --git a/example/main/example_backend.c b/example/main/example_backend.c
index b32ded55..e7872747 100644
--- a/example/main/example_backend.c
+++ b/example/main/example_backend.c
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/example/main/example_backend_nacm.c b/example/main/example_backend_nacm.c
index 5e05be47..fda272ba 100644
--- a/example/main/example_backend_nacm.c
+++ b/example/main/example_backend_nacm.c
@@ -3,7 +3,7 @@
   ***** BEGIN LICENSE BLOCK *****
  
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/example/main/example_cli.c b/example/main/example_cli.c
index 714d1174..80400688 100644
--- a/example/main/example_cli.c
+++ b/example/main/example_cli.c
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/include/clixon_custom.h b/include/clixon_custom.h
index 00e57912..1a26b89e 100644
--- a/include/clixon_custom.h
+++ b/include/clixon_custom.h
@@ -2,7 +2,7 @@
   ***** BEGIN LICENSE BLOCK *****
  
   Copyright (C) 2009-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/clixon/clixon.h.in b/lib/clixon/clixon.h.in
index 2c0f3a71..59043ede 100644
--- a/lib/clixon/clixon.h.in
+++ b/lib/clixon/clixon.h.in
@@ -3,7 +3,8 @@
   ***** BEGIN LICENSE BLOCK *****
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
-  Copyright (C) 2017-2020 Olof Hagsand
+  Copyright (C) 2017-2019 Olof Hagsand
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
@@ -91,8 +92,8 @@
 #include <clixon/clixon_validate.h>
 #include <clixon/clixon_datastore.h>
 #include <clixon/clixon_xpath_ctx.h>
-#include <clixon/clixon_xpath_optimize.h>
 #include <clixon/clixon_xpath.h>
+#include <clixon/clixon_xpath_optimize.h>
 #include <clixon/clixon_json.h>
 #include <clixon/clixon_nacm.h>
 #include <clixon/clixon_xml_changelog.h>
diff --git a/lib/clixon/clixon_datastore.h b/lib/clixon/clixon_datastore.h
index ceec04c3..0647f424 100644
--- a/lib/clixon/clixon_datastore.h
+++ b/lib/clixon/clixon_datastore.h
@@ -3,7 +3,7 @@
   ***** BEGIN LICENSE BLOCK *****
  
   Copyright (C) 2009-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/clixon/clixon_err.h b/lib/clixon/clixon_err.h
index 0cff3753..16a9a010 100644
--- a/lib/clixon/clixon_err.h
+++ b/lib/clixon/clixon_err.h
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/clixon/clixon_json.h b/lib/clixon/clixon_json.h
index 450ba30f..0a15525d 100644
--- a/lib/clixon/clixon_json.h
+++ b/lib/clixon/clixon_json.h
@@ -3,7 +3,7 @@
   ***** BEGIN LICENSE BLOCK *****
  
   Copyright (C) 2009-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/clixon/clixon_nacm.h b/lib/clixon/clixon_nacm.h
index cfec270c..dd5e7a74 100644
--- a/lib/clixon/clixon_nacm.h
+++ b/lib/clixon/clixon_nacm.h
@@ -3,7 +3,7 @@
   ***** BEGIN LICENSE BLOCK *****
  
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/clixon/clixon_netconf_lib.h b/lib/clixon/clixon_netconf_lib.h
index 7ec3fe37..4cc5a5cb 100644
--- a/lib/clixon/clixon_netconf_lib.h
+++ b/lib/clixon/clixon_netconf_lib.h
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/clixon/clixon_options.h b/lib/clixon/clixon_options.h
index 554ec763..bf19a169 100644
--- a/lib/clixon/clixon_options.h
+++ b/lib/clixon/clixon_options.h
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/clixon/clixon_path.h b/lib/clixon/clixon_path.h
index 69a7f798..ea665af2 100644
--- a/lib/clixon/clixon_path.h
+++ b/lib/clixon/clixon_path.h
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/clixon/clixon_plugin.h b/lib/clixon/clixon_plugin.h
index e4fedb22..97810cfb 100644
--- a/lib/clixon/clixon_plugin.h
+++ b/lib/clixon/clixon_plugin.h
@@ -3,7 +3,7 @@
   ***** BEGIN LICENSE BLOCK *****
  
   Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/clixon/clixon_proto_client.h b/lib/clixon/clixon_proto_client.h
index 204e19a5..9b3d277b 100644
--- a/lib/clixon/clixon_proto_client.h
+++ b/lib/clixon/clixon_proto_client.h
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/clixon/clixon_string.h b/lib/clixon/clixon_string.h
index 0e7d9dda..b5ab2bd6 100644
--- a/lib/clixon/clixon_string.h
+++ b/lib/clixon/clixon_string.h
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/clixon/clixon_xml.h b/lib/clixon/clixon_xml.h
index 28fba1f6..40950f91 100644
--- a/lib/clixon/clixon_xml.h
+++ b/lib/clixon/clixon_xml.h
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/clixon/clixon_xml_bind.h b/lib/clixon/clixon_xml_bind.h
index 7064c3ef..eff92121 100644
--- a/lib/clixon/clixon_xml_bind.h
+++ b/lib/clixon/clixon_xml_bind.h
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/clixon/clixon_xml_io.h b/lib/clixon/clixon_xml_io.h
index ff7f4780..fa5f1df7 100644
--- a/lib/clixon/clixon_xml_io.h
+++ b/lib/clixon/clixon_xml_io.h
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/clixon/clixon_xml_map.h b/lib/clixon/clixon_xml_map.h
index e4faa7a3..f64f449f 100644
--- a/lib/clixon/clixon_xml_map.h
+++ b/lib/clixon/clixon_xml_map.h
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/clixon/clixon_xml_vec.h b/lib/clixon/clixon_xml_vec.h
index 92ecc477..cb34e247 100644
--- a/lib/clixon/clixon_xml_vec.h
+++ b/lib/clixon/clixon_xml_vec.h
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/clixon/clixon_xpath_optimize.h b/lib/clixon/clixon_xpath_optimize.h
index adefe451..b6d2b401 100644
--- a/lib/clixon/clixon_xpath_optimize.h
+++ b/lib/clixon/clixon_xpath_optimize.h
@@ -3,6 +3,7 @@
   ***** BEGIN LICENSE BLOCK *****
  
   Copyright (C) 2009-2019 Olof Hagsand
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
@@ -41,10 +42,6 @@
 int  xpath_list_optimize_stats(int *hits);
 int  xpath_list_optimize_set(int enable); 
 void xpath_optimize_exit(void);
-#if 0 /* XXX kludge for include file dependencies */
 int  xpath_optimize_check(xpath_tree *xs, cxobj *xv, cxobj ***xvec0, int *xlen0);
-#else
-int  xpath_optimize_check();
-#endif
 
 #endif /* _CLIXON_XPATH_OPTIMIZE_H */
diff --git a/lib/clixon/clixon_yang.h b/lib/clixon/clixon_yang.h
index ea57b2fc..dcd758c6 100644
--- a/lib/clixon/clixon_yang.h
+++ b/lib/clixon/clixon_yang.h
@@ -3,7 +3,7 @@
   ***** BEGIN LICENSE BLOCK *****
  
   Copyright (C) 2009-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/clixon/clixon_yang_module.h b/lib/clixon/clixon_yang_module.h
index 5201b796..178d4b0a 100644
--- a/lib/clixon/clixon_yang_module.h
+++ b/lib/clixon/clixon_yang_module.h
@@ -3,7 +3,7 @@
   ***** BEGIN LICENSE BLOCK *****
  
   Copyright (C) 2009-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_api_path_parse.h b/lib/src/clixon_api_path_parse.h
index 9f96191b..7e42535b 100644
--- a/lib/src/clixon_api_path_parse.h
+++ b/lib/src/clixon_api_path_parse.h
@@ -3,7 +3,7 @@
   ***** BEGIN LICENSE BLOCK *****
  
   Copyright (C) 2009-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_api_path_parse.l b/lib/src/clixon_api_path_parse.l
index a47d2051..a8624739 100644
--- a/lib/src/clixon_api_path_parse.l
+++ b/lib/src/clixon_api_path_parse.l
@@ -3,7 +3,7 @@
   ***** BEGIN LICENSE BLOCK *****
  
   Copyright (C) 2009-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_api_path_parse.y b/lib/src/clixon_api_path_parse.y
index 444f290e..8b03c6c6 100644
--- a/lib/src/clixon_api_path_parse.y
+++ b/lib/src/clixon_api_path_parse.y
@@ -3,7 +3,7 @@
   ***** BEGIN LICENSE BLOCK *****
  
   Copyright (C) 2009-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_datastore_read.c b/lib/src/clixon_datastore_read.c
index e4c064fd..8cdf04d5 100644
--- a/lib/src/clixon_datastore_read.c
+++ b/lib/src/clixon_datastore_read.c
@@ -3,7 +3,7 @@
   ***** BEGIN LICENSE BLOCK *****
  
   Copyright (C) 2009-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_datastore_write.c b/lib/src/clixon_datastore_write.c
index 3e673a0f..3fcfaf44 100644
--- a/lib/src/clixon_datastore_write.c
+++ b/lib/src/clixon_datastore_write.c
@@ -3,7 +3,7 @@
   ***** BEGIN LICENSE BLOCK *****
  
   Copyright (C) 2009-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_err.c b/lib/src/clixon_err.c
index 3eff10c2..f2c97f64 100644
--- a/lib/src/clixon_err.c
+++ b/lib/src/clixon_err.c
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_file.c b/lib/src/clixon_file.c
index 863833c9..fac683ca 100644
--- a/lib/src/clixon_file.c
+++ b/lib/src/clixon_file.c
@@ -3,7 +3,7 @@
   ***** BEGIN LICENSE BLOCK *****
  
   Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_instance_id_parse.h b/lib/src/clixon_instance_id_parse.h
index 4a85bfb0..995ad89c 100644
--- a/lib/src/clixon_instance_id_parse.h
+++ b/lib/src/clixon_instance_id_parse.h
@@ -3,7 +3,7 @@
   ***** BEGIN LICENSE BLOCK *****
  
   Copyright (C) 2009-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_instance_id_parse.l b/lib/src/clixon_instance_id_parse.l
index 4dd3e5af..0393e4ab 100644
--- a/lib/src/clixon_instance_id_parse.l
+++ b/lib/src/clixon_instance_id_parse.l
@@ -3,7 +3,7 @@
   ***** BEGIN LICENSE BLOCK *****
  
   Copyright (C) 2009-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_instance_id_parse.y b/lib/src/clixon_instance_id_parse.y
index 6ec94595..593c9cfa 100644
--- a/lib/src/clixon_instance_id_parse.y
+++ b/lib/src/clixon_instance_id_parse.y
@@ -3,7 +3,7 @@
   ***** BEGIN LICENSE BLOCK *****
  
   Copyright (C) 2009-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_json.c b/lib/src/clixon_json.c
index 8782befc..36d06a8d 100644
--- a/lib/src/clixon_json.c
+++ b/lib/src/clixon_json.c
@@ -3,7 +3,7 @@
   ***** BEGIN LICENSE BLOCK *****
  
   Copyright (C) 2009-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_json_parse.h b/lib/src/clixon_json_parse.h
index 0843c5b3..b5ef14c5 100644
--- a/lib/src/clixon_json_parse.h
+++ b/lib/src/clixon_json_parse.h
@@ -3,7 +3,7 @@
   ***** BEGIN LICENSE BLOCK *****
  
   Copyright (C) 2009-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_json_parse.l b/lib/src/clixon_json_parse.l
index 7c87b403..cc22b387 100644
--- a/lib/src/clixon_json_parse.l
+++ b/lib/src/clixon_json_parse.l
@@ -3,7 +3,7 @@
   ***** BEGIN LICENSE BLOCK *****
  
   Copyright (C) 2009-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_json_parse.y b/lib/src/clixon_json_parse.y
index 44a4c020..2c7f2e72 100644
--- a/lib/src/clixon_json_parse.y
+++ b/lib/src/clixon_json_parse.y
@@ -3,7 +3,7 @@
   ***** BEGIN LICENSE BLOCK *****
  
   Copyright (C) 2009-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_nacm.c b/lib/src/clixon_nacm.c
index 0bd543f9..df5c2809 100644
--- a/lib/src/clixon_nacm.c
+++ b/lib/src/clixon_nacm.c
@@ -3,7 +3,7 @@
   ***** BEGIN LICENSE BLOCK *****
  
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_netconf_lib.c b/lib/src/clixon_netconf_lib.c
index dc604a89..633b5c8e 100644
--- a/lib/src/clixon_netconf_lib.c
+++ b/lib/src/clixon_netconf_lib.c
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_options.c b/lib/src/clixon_options.c
index be0115c6..81a5a07e 100644
--- a/lib/src/clixon_options.c
+++ b/lib/src/clixon_options.c
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_path.c b/lib/src/clixon_path.c
index 2140e988..539747a5 100644
--- a/lib/src/clixon_path.c
+++ b/lib/src/clixon_path.c
@@ -3,7 +3,7 @@
   ***** BEGIN LICENSE BLOCK *****
  
   Copyright (C) 2009-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
@@ -1338,6 +1338,8 @@ api_path_resolve(clixon_path *cplist,
  * - Corresponding yang node for id not found
  * - Number of keys in key-value list does not match Yang list
  * - Key-values only defined for list or leaf-list
+ * @note key-value presence in lists is not enforced due to use-cases where instance-id need not have
+ *       them (eg RFC8341) alternative could be to have a "strict" parameter, but gets complicated
  * @see api_path_resolve
  */
 static int
@@ -1374,13 +1376,13 @@ instance_id_resolve(clixon_path *cplist,
 	    switch (yang_keyword_get(yc)){
 	    case Y_LIST:
 		if (cp->cp_cvk == NULL){
-#if 0 /* XXX why is this not enforced? */
+#if 0 /* see key-value presence in lists note above */
 		    clicon_err(OE_YANG, ENOENT, "key-values mandatory for lists");
 		    goto fail;		    
 #endif
 		    break;
 		}
-#if 0 /* XXX why is this not enforced? */
+#if 0 /* see key-value presence in lists note above */
 		if (cvec_len(cp->cp_cvk) > cvec_len(yang_cvec_get(yc))){
 		    clicon_err(OE_YANG, ENOENT, "Number of keys in key-value list does not match Yang list ");
 		    goto fail;
diff --git a/lib/src/clixon_plugin.c b/lib/src/clixon_plugin.c
index eaf7e024..55f3a1f9 100644
--- a/lib/src/clixon_plugin.c
+++ b/lib/src/clixon_plugin.c
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_proto.c b/lib/src/clixon_proto.c
index f2a162b4..1c24dcc3 100644
--- a/lib/src/clixon_proto.c
+++ b/lib/src/clixon_proto.c
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_proto_client.c b/lib/src/clixon_proto_client.c
index 9f0ba898..fcf9d2e4 100644
--- a/lib/src/clixon_proto_client.c
+++ b/lib/src/clixon_proto_client.c
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_string.c b/lib/src/clixon_string.c
index f0298bf0..90869120 100644
--- a/lib/src/clixon_string.c
+++ b/lib/src/clixon_string.c
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_validate.c b/lib/src/clixon_validate.c
index 5aa9e430..5cd71ec5 100644
--- a/lib/src/clixon_validate.c
+++ b/lib/src/clixon_validate.c
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_xml.c b/lib/src/clixon_xml.c
index ab4999a7..73ce63c3 100644
--- a/lib/src/clixon_xml.c
+++ b/lib/src/clixon_xml.c
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_xml_bind.c b/lib/src/clixon_xml_bind.c
index 466f1c64..e9668904 100644
--- a/lib/src/clixon_xml_bind.c
+++ b/lib/src/clixon_xml_bind.c
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_xml_changelog.c b/lib/src/clixon_xml_changelog.c
index 0ce673af..2336cd87 100644
--- a/lib/src/clixon_xml_changelog.c
+++ b/lib/src/clixon_xml_changelog.c
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_xml_io.c b/lib/src/clixon_xml_io.c
index 16a33151..8fc40061 100644
--- a/lib/src/clixon_xml_io.c
+++ b/lib/src/clixon_xml_io.c
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_xml_map.c b/lib/src/clixon_xml_map.c
index 185d79d8..cc70623d 100644
--- a/lib/src/clixon_xml_map.c
+++ b/lib/src/clixon_xml_map.c
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_xml_nsctx.c b/lib/src/clixon_xml_nsctx.c
index 82066f5c..7a900ae5 100644
--- a/lib/src/clixon_xml_nsctx.c
+++ b/lib/src/clixon_xml_nsctx.c
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_xml_parse.h b/lib/src/clixon_xml_parse.h
index 3bac7666..4470bf0c 100644
--- a/lib/src/clixon_xml_parse.h
+++ b/lib/src/clixon_xml_parse.h
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_xml_parse.l b/lib/src/clixon_xml_parse.l
index 3e156c72..f192b5a3 100644
--- a/lib/src/clixon_xml_parse.l
+++ b/lib/src/clixon_xml_parse.l
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_xml_parse.y b/lib/src/clixon_xml_parse.y
index 391f20ef..6cba0024 100644
--- a/lib/src/clixon_xml_parse.y
+++ b/lib/src/clixon_xml_parse.y
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_xml_sort.c b/lib/src/clixon_xml_sort.c
index f78af4a0..16ad03ce 100644
--- a/lib/src/clixon_xml_sort.c
+++ b/lib/src/clixon_xml_sort.c
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_xml_vec.c b/lib/src/clixon_xml_vec.c
index 2ed9dd31..8a23249f 100644
--- a/lib/src/clixon_xml_vec.c
+++ b/lib/src/clixon_xml_vec.c
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_xpath.c b/lib/src/clixon_xpath.c
index 8149a109..a7ff7116 100644
--- a/lib/src/clixon_xpath.c
+++ b/lib/src/clixon_xpath.c
@@ -3,7 +3,7 @@
   ***** BEGIN LICENSE BLOCK *****
  
   Copyright (C) 2009-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_xpath_eval.c b/lib/src/clixon_xpath_eval.c
index 5ccac9d3..69b547f6 100644
--- a/lib/src/clixon_xpath_eval.c
+++ b/lib/src/clixon_xpath_eval.c
@@ -3,7 +3,7 @@
   ***** BEGIN LICENSE BLOCK *****
  
   Copyright (C) 2009-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_xpath_optimize.c b/lib/src/clixon_xpath_optimize.c
index c237fbec..2b3bc286 100644
--- a/lib/src/clixon_xpath_optimize.c
+++ b/lib/src/clixon_xpath_optimize.c
@@ -3,7 +3,7 @@
   ***** BEGIN LICENSE BLOCK *****
  
   Copyright (C) 2009-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_xpath_parse.h b/lib/src/clixon_xpath_parse.h
index 5a372d7f..8fa28d0f 100644
--- a/lib/src/clixon_xpath_parse.h
+++ b/lib/src/clixon_xpath_parse.h
@@ -3,7 +3,7 @@
   ***** BEGIN LICENSE BLOCK *****
  
   Copyright (C) 2009-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_xpath_parse.l b/lib/src/clixon_xpath_parse.l
index 1c7bbc8e..c02dbd3b 100644
--- a/lib/src/clixon_xpath_parse.l
+++ b/lib/src/clixon_xpath_parse.l
@@ -3,7 +3,7 @@
   ***** BEGIN LICENSE BLOCK *****
  
   Copyright (C) 2009-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_xpath_parse.y b/lib/src/clixon_xpath_parse.y
index e6254885..9f573873 100644
--- a/lib/src/clixon_xpath_parse.y
+++ b/lib/src/clixon_xpath_parse.y
@@ -3,7 +3,7 @@
   ***** BEGIN LICENSE BLOCK *****
  
   Copyright (C) 2009-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_yang.c b/lib/src/clixon_yang.c
index 84b49f87..e3a0744d 100644
--- a/lib/src/clixon_yang.c
+++ b/lib/src/clixon_yang.c
@@ -3,7 +3,7 @@
   ***** BEGIN LICENSE BLOCK *****
  
   Copyright (C) 2009-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_yang_module.c b/lib/src/clixon_yang_module.c
index 6c3ebf63..d3a8c030 100644
--- a/lib/src/clixon_yang_module.c
+++ b/lib/src/clixon_yang_module.c
@@ -3,7 +3,7 @@
   ***** BEGIN LICENSE BLOCK *****
  
   Copyright (C) 2009-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_yang_parse.h b/lib/src/clixon_yang_parse.h
index 08b760db..9c86c4cc 100644
--- a/lib/src/clixon_yang_parse.h
+++ b/lib/src/clixon_yang_parse.h
@@ -6,7 +6,7 @@
   ***** BEGIN LICENSE BLOCK *****
  
   Copyright (C) 2009-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_yang_parse.l b/lib/src/clixon_yang_parse.l
index e4ade593..920b140f 100644
--- a/lib/src/clixon_yang_parse.l
+++ b/lib/src/clixon_yang_parse.l
@@ -2,7 +2,7 @@
   ***** BEGIN LICENSE BLOCK *****
  
   Copyright (C) 2009-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_yang_parse.y b/lib/src/clixon_yang_parse.y
index 2b53b779..de147a03 100644
--- a/lib/src/clixon_yang_parse.y
+++ b/lib/src/clixon_yang_parse.y
@@ -3,7 +3,7 @@
   ***** BEGIN LICENSE BLOCK *****
  
   Copyright (C) 2009-2020 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/lib/src/clixon_yang_parse_lib.c b/lib/src/clixon_yang_parse_lib.c
index f7b7fb36..f834bf3e 100644
--- a/lib/src/clixon_yang_parse_lib.c
+++ b/lib/src/clixon_yang_parse_lib.c
@@ -3,7 +3,7 @@
   ***** BEGIN LICENSE BLOCK *****
  
   Copyright (C) 2009-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/test/test_perf_startup.sh b/test/test_perf_startup.sh
index 2f080cc8..27d7014b 100755
--- a/test/test_perf_startup.sh
+++ b/test/test_perf_startup.sh
@@ -6,6 +6,7 @@ s="$_" ; . ./lib.sh || if [ "$s" = $0 ]; then exit 0; else return 0; fi
 
 # Number of list/leaf-list entries in file
 : ${perfnr:=10000}
+: ${pretty:=false}
 
 APPNAME=example
 
@@ -76,11 +77,35 @@ fi
 # Use it latter to generate startup-db in xml, tree formats
 tmpx=$dir/tmp.xml
 new "generate large startup config ($tmpx) with $perfnr entries"
-echo -n "<config><x0 xmlns=\"urn:example:clixon\"><x1><x2><name>ip</name><x>" > $tmpx
-for (( i=0; i<$perfnr; i++ )); do  
-    echo -n "<y><a>$i</a><b>$i</b></y>" >> $tmpx
-done
-echo "</x></x2></x1></x0></config>" >> $tmpx
+if $pretty; then
+cat<<EOF >  $tmpx
+<config>
+   <x0 xmlns="urn:example:clixon">
+      <x1>
+         <x2>
+            <name>ip</name>
+            <x>
+EOF
+    for (( i=0; i<$perfnr; i++ )); do  
+	echo "               <y>" >> $tmpx
+	echo "                  <a>$i</a>" >> $tmpx
+	echo "                  <b>$i</b>" >> $tmpx
+	echo "               </y>" >> $tmpx
+    done
+cat<<EOF >>  $tmpx
+            </x>
+         </x2>
+      </x1>
+   </x0>
+</config>
+EOF
+else
+    echo -n "<config><x0 xmlns=\"urn:example:clixon\"><x1><x2><name>ip</name><x>" > $tmpx
+    for (( i=0; i<$perfnr; i++ )); do  
+	echo -n "<y><a>$i</a><b>$i</b></y>" >> $tmpx
+    done
+    echo "</x></x2></x1></x0></config>" >> $tmpx
+fi
 
 if false; then # XXX JSON dont work as datastore yet
 # Then generate large JSON file (cant translate namespace - long story)
@@ -118,6 +143,7 @@ for mode in startup running; do
 	echo "time sudo $clixon_backend -F1 -D $DBG -s $mode -f $cfg -y $fyang -o CLICON_XMLDB_FORMAT=$format"
 	# Cannot use start_backend here due to expected error case
 { time -p sudo $clixon_backend -F1 -D $DBG -s $mode -f $cfg -y $fyang -o CLICON_XMLDB_FORMAT=$format 2> /dev/null; } 2>&1 | awk '/real/ {print $2}'
+exit
     done
 done
 
diff --git a/util/clixon_util_datastore.c b/util/clixon_util_datastore.c
index c3e5a808..037f2298 100644
--- a/util/clixon_util_datastore.c
+++ b/util/clixon_util_datastore.c
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/util/clixon_util_grpc.c b/util/clixon_util_grpc.c
index 771de00a..6ed0a09a 100644
--- a/util/clixon_util_grpc.c
+++ b/util/clixon_util_grpc.c
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/util/clixon_util_path.c b/util/clixon_util_path.c
index 85a24ea6..d77134a9 100644
--- a/util/clixon_util_path.c
+++ b/util/clixon_util_path.c
@@ -3,7 +3,7 @@
   ***** BEGIN LICENSE BLOCK *****
  
   Copyright (C) 2009-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/util/clixon_util_xml.c b/util/clixon_util_xml.c
index d92fed77..b4aa6839 100644
--- a/util/clixon_util_xml.c
+++ b/util/clixon_util_xml.c
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/util/clixon_util_xml_mod.c b/util/clixon_util_xml_mod.c
index aeea2a96..08948ce2 100644
--- a/util/clixon_util_xml_mod.c
+++ b/util/clixon_util_xml_mod.c
@@ -4,7 +4,7 @@
  
   Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
   Copyright (C) 2017-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/util/clixon_util_xpath.c b/util/clixon_util_xpath.c
index 4078d000..ddcdaea8 100644
--- a/util/clixon_util_xpath.c
+++ b/util/clixon_util_xpath.c
@@ -3,7 +3,7 @@
   ***** BEGIN LICENSE BLOCK *****
  
   Copyright (C) 2009-2019 Olof Hagsand
-  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+  Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
 
   This file is part of CLIXON.
 
diff --git a/yang/clixon/clixon-config@2020-02-22.yang b/yang/clixon/clixon-config@2020-02-22.yang
index b9a551a7..aa08151f 100644
--- a/yang/clixon/clixon-config@2020-02-22.yang
+++ b/yang/clixon/clixon-config@2020-02-22.yang
@@ -13,7 +13,7 @@ module clixon-config {
       "Clixon configuration file
        ***** BEGIN LICENSE BLOCK *****
        Copyright (C) 2009-2019 Olof Hagsand
-       Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC
+       Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
        
        This file is part of CLIXON