diff --git a/config/env.go b/config/env.go
index 3a6216f9a..11d7eed75 100644
--- a/config/env.go
+++ b/config/env.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/subconfig.go b/config/subconfig.go
index e1bdfef36..9df4fe17a 100644
--- a/config/subconfig.go
+++ b/config/subconfig.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/api_impl/base_entity_api_model.go b/controller/api_impl/base_entity_api_model.go
index 1f7cd2b60..0352e8e88 100644
--- a/controller/api_impl/base_entity_api_model.go
+++ b/controller/api_impl/base_entity_api_model.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/api_impl/base_router.go b/controller/api_impl/base_router.go
index 04b8be48f..6f4a0e359 100644
--- a/controller/api_impl/base_router.go
+++ b/controller/api_impl/base_router.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/api_impl/circuit_api_model.go b/controller/api_impl/circuit_api_model.go
index 17f63f7b7..769b4ea17 100644
--- a/controller/api_impl/circuit_api_model.go
+++ b/controller/api_impl/circuit_api_model.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/api_impl/circuit_router.go b/controller/api_impl/circuit_router.go
index c1b0ee7cd..15143a505 100644
--- a/controller/api_impl/circuit_router.go
+++ b/controller/api_impl/circuit_router.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/api_impl/context.go b/controller/api_impl/context.go
index 0aab3bda4..d28f8fe48 100644
--- a/controller/api_impl/context.go
+++ b/controller/api_impl/context.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/api_impl/database_router.go b/controller/api_impl/database_router.go
index e58d52a21..5fc885c22 100644
--- a/controller/api_impl/database_router.go
+++ b/controller/api_impl/database_router.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/api_impl/inspections_api_model.go b/controller/api_impl/inspections_api_model.go
index dc0f4dfba..912d2d935 100644
--- a/controller/api_impl/inspections_api_model.go
+++ b/controller/api_impl/inspections_api_model.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/api_impl/inspections_router.go b/controller/api_impl/inspections_router.go
index c2683bc2a..03791bf86 100644
--- a/controller/api_impl/inspections_router.go
+++ b/controller/api_impl/inspections_router.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/api_impl/link_api_model.go b/controller/api_impl/link_api_model.go
index bca6c6a33..7a9bbc338 100644
--- a/controller/api_impl/link_api_model.go
+++ b/controller/api_impl/link_api_model.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/api_impl/link_router.go b/controller/api_impl/link_router.go
index e066d00f5..d0d13e66c 100644
--- a/controller/api_impl/link_router.go
+++ b/controller/api_impl/link_router.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/api_impl/management-api.go b/controller/api_impl/management-api.go
index a92209e9d..d7d745b29 100644
--- a/controller/api_impl/management-api.go
+++ b/controller/api_impl/management-api.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/api_impl/metrics-api.go b/controller/api_impl/metrics-api.go
index ad44caacb..61a2f197f 100644
--- a/controller/api_impl/metrics-api.go
+++ b/controller/api_impl/metrics-api.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/api_impl/metrics_api_model.go b/controller/api_impl/metrics_api_model.go
index d3ff1ada1..01f1d7b92 100644
--- a/controller/api_impl/metrics_api_model.go
+++ b/controller/api_impl/metrics_api_model.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/api_impl/query_options.go b/controller/api_impl/query_options.go
index 426ef38be..fb406044f 100644
--- a/controller/api_impl/query_options.go
+++ b/controller/api_impl/query_options.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/api_impl/router_api_model.go b/controller/api_impl/router_api_model.go
index ea26dc188..25614f6a5 100644
--- a/controller/api_impl/router_api_model.go
+++ b/controller/api_impl/router_api_model.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/api_impl/router_router.go b/controller/api_impl/router_router.go
index fb505902b..4d2ba1558 100644
--- a/controller/api_impl/router_router.go
+++ b/controller/api_impl/router_router.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/api_impl/routes.go b/controller/api_impl/routes.go
index aa8118928..602ddcd87 100644
--- a/controller/api_impl/routes.go
+++ b/controller/api_impl/routes.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/api_impl/service_api_model.go b/controller/api_impl/service_api_model.go
index f55dae488..47f6a2f16 100644
--- a/controller/api_impl/service_api_model.go
+++ b/controller/api_impl/service_api_model.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/api_impl/service_router.go b/controller/api_impl/service_router.go
index 6cd89f099..f156c7600 100644
--- a/controller/api_impl/service_router.go
+++ b/controller/api_impl/service_router.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/api_impl/terminator_api_model.go b/controller/api_impl/terminator_api_model.go
index b4fddba6f..1cf2fe4e4 100644
--- a/controller/api_impl/terminator_api_model.go
+++ b/controller/api_impl/terminator_api_model.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/api_impl/terminator_router.go b/controller/api_impl/terminator_router.go
index 2ea2c9b97..bcdd3f8ca 100644
--- a/controller/api_impl/terminator_router.go
+++ b/controller/api_impl/terminator_router.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/api_impl/versions.go b/controller/api_impl/versions.go
index b6d805dc6..878ae3471 100644
--- a/controller/api_impl/versions.go
+++ b/controller/api_impl/versions.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/apierror/api.go b/controller/apierror/api.go
index a42e35571..ba63676f9 100644
--- a/controller/apierror/api.go
+++ b/controller/apierror/api.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/apierror/bodyparser.go b/controller/apierror/bodyparser.go
index a0d6f6b61..f3415302d 100644
--- a/controller/apierror/bodyparser.go
+++ b/controller/apierror/bodyparser.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/apierror/helpers.go b/controller/apierror/helpers.go
index e9128b4a4..418eb8dd1 100644
--- a/controller/apierror/helpers.go
+++ b/controller/apierror/helpers.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/apierror/json.go b/controller/apierror/json.go
index 3c20cd374..28f3e86db 100644
--- a/controller/apierror/json.go
+++ b/controller/apierror/json.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/apierror/messages.go b/controller/apierror/messages.go
index ae0cc7f76..cda42b066 100644
--- a/controller/apierror/messages.go
+++ b/controller/apierror/messages.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/command/command.go b/controller/command/command.go
index d0c5fc612..344555169 100644
--- a/controller/command/command.go
+++ b/controller/command/command.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/command/registry.go b/controller/command/registry.go
index 1cdb4a69b..883f98642 100644
--- a/controller/command/registry.go
+++ b/controller/command/registry.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/config.go b/controller/config.go
index d3b72dc76..576cc9690 100644
--- a/controller/config.go
+++ b/controller/config.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/controller.go b/controller/controller.go
index 643d41ceb..695a5a472 100644
--- a/controller/controller.go
+++ b/controller/controller.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/db/base_store.go b/controller/db/base_store.go
index 612168311..0b8f11432 100644
--- a/controller/db/base_store.go
+++ b/controller/db/base_store.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/db/db.go b/controller/db/db.go
index c253676f2..6592cb9e6 100644
--- a/controller/db/db.go
+++ b/controller/db/db.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/db/router_store.go b/controller/db/router_store.go
index d62333ca5..7c45a3b83 100644
--- a/controller/db/router_store.go
+++ b/controller/db/router_store.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/db/router_store_test.go b/controller/db/router_store_test.go
index b8509428a..923407ca7 100644
--- a/controller/db/router_store_test.go
+++ b/controller/db/router_store_test.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/db/service_store.go b/controller/db/service_store.go
index 36403942b..3d639e9fe 100644
--- a/controller/db/service_store.go
+++ b/controller/db/service_store.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/db/service_store_test.go b/controller/db/service_store_test.go
index 503c474d2..d9995854b 100644
--- a/controller/db/service_store_test.go
+++ b/controller/db/service_store_test.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/db/stores.go b/controller/db/stores.go
index f69e5f076..07d5eb889 100644
--- a/controller/db/stores.go
+++ b/controller/db/stores.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/db/terminator_store.go b/controller/db/terminator_store.go
index 01466c53d..451c52aec 100644
--- a/controller/db/terminator_store.go
+++ b/controller/db/terminator_store.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/db/terminator_store_test.go b/controller/db/terminator_store_test.go
index c564c9282..0753ec0a3 100644
--- a/controller/db/terminator_store_test.go
+++ b/controller/db/terminator_store_test.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/handler_ctrl/accept.go b/controller/handler_ctrl/accept.go
index 63f524491..909fc9711 100644
--- a/controller/handler_ctrl/accept.go
+++ b/controller/handler_ctrl/accept.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/handler_ctrl/bind.go b/controller/handler_ctrl/bind.go
index 82d97d244..64d110ef4 100644
--- a/controller/handler_ctrl/bind.go
+++ b/controller/handler_ctrl/bind.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/handler_ctrl/circuit_confirmation.go b/controller/handler_ctrl/circuit_confirmation.go
index ec45c5070..205306a96 100644
--- a/controller/handler_ctrl/circuit_confirmation.go
+++ b/controller/handler_ctrl/circuit_confirmation.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/handler_ctrl/circuit_request.go b/controller/handler_ctrl/circuit_request.go
index 0476ce77e..6c7d2f11a 100644
--- a/controller/handler_ctrl/circuit_request.go
+++ b/controller/handler_ctrl/circuit_request.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/handler_ctrl/close.go b/controller/handler_ctrl/close.go
index b9eb5020b..57f4135b2 100644
--- a/controller/handler_ctrl/close.go
+++ b/controller/handler_ctrl/close.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/handler_ctrl/connect.go b/controller/handler_ctrl/connect.go
index 93a6bc78f..74a798a5f 100644
--- a/controller/handler_ctrl/connect.go
+++ b/controller/handler_ctrl/connect.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/handler_ctrl/create_terminator.go b/controller/handler_ctrl/create_terminator.go
index 009a85ef6..77da1c7e6 100644
--- a/controller/handler_ctrl/create_terminator.go
+++ b/controller/handler_ctrl/create_terminator.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/handler_ctrl/fault.go b/controller/handler_ctrl/fault.go
index 037882caa..731a0338b 100644
--- a/controller/handler_ctrl/fault.go
+++ b/controller/handler_ctrl/fault.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/handler_ctrl/inspect.go b/controller/handler_ctrl/inspect.go
index c0aee3cc7..5c4b4d150 100644
--- a/controller/handler_ctrl/inspect.go
+++ b/controller/handler_ctrl/inspect.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/handler_ctrl/link_connected.go b/controller/handler_ctrl/link_connected.go
index aaba25ca6..278f05cc0 100644
--- a/controller/handler_ctrl/link_connected.go
+++ b/controller/handler_ctrl/link_connected.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/handler_ctrl/metrics.go b/controller/handler_ctrl/metrics.go
index b68d2f7be..abc0358c7 100644
--- a/controller/handler_ctrl/metrics.go
+++ b/controller/handler_ctrl/metrics.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/handler_ctrl/ping.go b/controller/handler_ctrl/ping.go
index 77430d7b3..ad27031a8 100644
--- a/controller/handler_ctrl/ping.go
+++ b/controller/handler_ctrl/ping.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/handler_ctrl/remove_terminator.go b/controller/handler_ctrl/remove_terminator.go
index 0bf8a4b93..a22adf4e1 100644
--- a/controller/handler_ctrl/remove_terminator.go
+++ b/controller/handler_ctrl/remove_terminator.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/handler_ctrl/route_result.go b/controller/handler_ctrl/route_result.go
index 27659ddef..fdbd55c5f 100644
--- a/controller/handler_ctrl/route_result.go
+++ b/controller/handler_ctrl/route_result.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/handler_ctrl/router_link.go b/controller/handler_ctrl/router_link.go
index bbd521fbf..3430fe885 100644
--- a/controller/handler_ctrl/router_link.go
+++ b/controller/handler_ctrl/router_link.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/handler_ctrl/update_terminator.go b/controller/handler_ctrl/update_terminator.go
index 62085a22a..5a1a10896 100644
--- a/controller/handler_ctrl/update_terminator.go
+++ b/controller/handler_ctrl/update_terminator.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/handler_ctrl/verify_link.go b/controller/handler_ctrl/verify_link.go
index 964a14be1..6561d8c03 100644
--- a/controller/handler_ctrl/verify_link.go
+++ b/controller/handler_ctrl/verify_link.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/handler_ctrl/verify_router.go b/controller/handler_ctrl/verify_router.go
index 6aeb35cc0..99aa4ce90 100644
--- a/controller/handler_ctrl/verify_router.go
+++ b/controller/handler_ctrl/verify_router.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/handler_mgmt/bind.go b/controller/handler_mgmt/bind.go
index 5530d7b04..ed24c42db 100644
--- a/controller/handler_mgmt/bind.go
+++ b/controller/handler_mgmt/bind.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/handler_mgmt/close.go b/controller/handler_mgmt/close.go
index b7eda5cbf..484537422 100644
--- a/controller/handler_mgmt/close.go
+++ b/controller/handler_mgmt/close.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/handler_mgmt/connect.go b/controller/handler_mgmt/connect.go
index bcade0b86..e5b9383f5 100644
--- a/controller/handler_mgmt/connect.go
+++ b/controller/handler_mgmt/connect.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/handler_mgmt/inspect.go b/controller/handler_mgmt/inspect.go
index 871a223b6..cbbfd9eba 100644
--- a/controller/handler_mgmt/inspect.go
+++ b/controller/handler_mgmt/inspect.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/handler_mgmt/stream_circuits.go b/controller/handler_mgmt/stream_circuits.go
index f3509489e..8055d08f0 100644
--- a/controller/handler_mgmt/stream_circuits.go
+++ b/controller/handler_mgmt/stream_circuits.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/handler_mgmt/stream_metrics.go b/controller/handler_mgmt/stream_metrics.go
index b3510c23a..51d6cf44f 100644
--- a/controller/handler_mgmt/stream_metrics.go
+++ b/controller/handler_mgmt/stream_metrics.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/handler_mgmt/stream_toggle_pipe_traces.go b/controller/handler_mgmt/stream_toggle_pipe_traces.go
index 9c4a4447c..2651d0b6c 100644
--- a/controller/handler_mgmt/stream_toggle_pipe_traces.go
+++ b/controller/handler_mgmt/stream_toggle_pipe_traces.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/handler_mgmt/stream_traces.go b/controller/handler_mgmt/stream_traces.go
index 6e5641ef0..f346770ce 100644
--- a/controller/handler_mgmt/stream_traces.go
+++ b/controller/handler_mgmt/stream_traces.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/models/base_model.go b/controller/models/base_model.go
index e267d143f..0f2362ad7 100644
--- a/controller/models/base_model.go
+++ b/controller/models/base_model.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/network/assembly.go b/controller/network/assembly.go
index 41e3ec1fb..3b0e37cbf 100644
--- a/controller/network/assembly.go
+++ b/controller/network/assembly.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/network/circuit.go b/controller/network/circuit.go
index c0a6fb2a8..6e03e50ea 100644
--- a/controller/network/circuit.go
+++ b/controller/network/circuit.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/network/circuit_lifecycle.go b/controller/network/circuit_lifecycle.go
index 4ddfe509d..096b6fee6 100644
--- a/controller/network/circuit_lifecycle.go
+++ b/controller/network/circuit_lifecycle.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/network/command.go b/controller/network/command.go
index 1e95f57d2..f7253e37e 100644
--- a/controller/network/command.go
+++ b/controller/network/command.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/network/fault.go b/controller/network/fault.go
index 332dc2a13..8bee1cbae 100644
--- a/controller/network/fault.go
+++ b/controller/network/fault.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/network/handler.go b/controller/network/handler.go
index a608a32f9..73fac5fa8 100644
--- a/controller/network/handler.go
+++ b/controller/network/handler.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/network/inspect.go b/controller/network/inspect.go
index 4dbfc9aeb..c1e8e41fe 100644
--- a/controller/network/inspect.go
+++ b/controller/network/inspect.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/network/link.go b/controller/network/link.go
index 556173a20..ada4f1a8a 100644
--- a/controller/network/link.go
+++ b/controller/network/link.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/network/link_controller.go b/controller/network/link_controller.go
index 411e4ec12..adaa643a3 100644
--- a/controller/network/link_controller.go
+++ b/controller/network/link_controller.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/network/link_controller_test.go b/controller/network/link_controller_test.go
index 4b9fc2d67..2a8809f3a 100644
--- a/controller/network/link_controller_test.go
+++ b/controller/network/link_controller_test.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/network/managers.go b/controller/network/managers.go
index 327ee94d7..486d4653f 100644
--- a/controller/network/managers.go
+++ b/controller/network/managers.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/network/network.go b/controller/network/network.go
index 91069961b..7bdff6883 100644
--- a/controller/network/network.go
+++ b/controller/network/network.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/network/options.go b/controller/network/options.go
index aa76dc7fc..99abeb555 100644
--- a/controller/network/options.go
+++ b/controller/network/options.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/network/path.go b/controller/network/path.go
index 9db340f50..53998ba49 100644
--- a/controller/network/path.go
+++ b/controller/network/path.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/network/path_test.go b/controller/network/path_test.go
index e0d3e3b31..e8e572b67 100644
--- a/controller/network/path_test.go
+++ b/controller/network/path_test.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/network/route_perf_test.go b/controller/network/route_perf_test.go
index ac4ec85de..dcf76530d 100644
--- a/controller/network/route_perf_test.go
+++ b/controller/network/route_perf_test.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/network/router.go b/controller/network/router.go
index a014af941..f1f924970 100644
--- a/controller/network/router.go
+++ b/controller/network/router.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/network/routesender.go b/controller/network/routesender.go
index 745b20bf2..a073be8a8 100644
--- a/controller/network/routesender.go
+++ b/controller/network/routesender.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/network/service.go b/controller/network/service.go
index 3cfd742e1..a9eb0c447 100644
--- a/controller/network/service.go
+++ b/controller/network/service.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/network/smart.go b/controller/network/smart.go
index 41317c8a7..b863c3c5d 100644
--- a/controller/network/smart.go
+++ b/controller/network/smart.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/network/terminator.go b/controller/network/terminator.go
index 433c940df..c9e2335e1 100644
--- a/controller/network/terminator.go
+++ b/controller/network/terminator.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.
 	You may obtain a copy of the License at
diff --git a/controller/network/util_test.go b/controller/network/util_test.go
index 18e3a0551..dca50e4c9 100644
--- a/controller/network/util_test.go
+++ b/controller/network/util_test.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/xctrl/ops.go b/controller/xctrl/ops.go
index 9cb50b24a..88db9bf75 100644
--- a/controller/xctrl/ops.go
+++ b/controller/xctrl/ops.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/xctrl/xctrl.go b/controller/xctrl/xctrl.go
index 8195cf0c3..be5b0dc1d 100644
--- a/controller/xctrl/xctrl.go
+++ b/controller/xctrl/xctrl.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/xctrl_example/example.go b/controller/xctrl_example/example.go
index 3c756e0bd..0834f3ed5 100644
--- a/controller/xctrl_example/example.go
+++ b/controller/xctrl_example/example.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/xctrl_example/receive.go b/controller/xctrl_example/receive.go
index 03f2ed8cf..5bced751a 100644
--- a/controller/xctrl_example/receive.go
+++ b/controller/xctrl_example/receive.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/xmgmt/xmgmt.go b/controller/xmgmt/xmgmt.go
index d37798932..899b9f9e1 100644
--- a/controller/xmgmt/xmgmt.go
+++ b/controller/xmgmt/xmgmt.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/xt/costs.go b/controller/xt/costs.go
index 8e84b55d1..5045f5b82 100644
--- a/controller/xt/costs.go
+++ b/controller/xt/costs.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/xt/events.go b/controller/xt/events.go
index 08eebef6f..0fbda805d 100644
--- a/controller/xt/events.go
+++ b/controller/xt/events.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/xt/registry.go b/controller/xt/registry.go
index ba56c770f..4f1f94d8e 100644
--- a/controller/xt/registry.go
+++ b/controller/xt/registry.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/xt/xt.go b/controller/xt/xt.go
index ee542d0b3..4881c16b9 100644
--- a/controller/xt/xt.go
+++ b/controller/xt/xt.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/xt_random/impl.go b/controller/xt_random/impl.go
index db3b4e869..ac118a777 100644
--- a/controller/xt_random/impl.go
+++ b/controller/xt_random/impl.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/xt_smartrouting/impl.go b/controller/xt_smartrouting/impl.go
index 5addc5b68..5cfd004e0 100644
--- a/controller/xt_smartrouting/impl.go
+++ b/controller/xt_smartrouting/impl.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/controller/xt_weighted/impl.go b/controller/xt_weighted/impl.go
index 4fac11954..04e280318 100644
--- a/controller/xt_weighted/impl.go
+++ b/controller/xt_weighted/impl.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/ctrl_msg/messages.go b/ctrl_msg/messages.go
index e82ed177f..c833a88ca 100644
--- a/ctrl_msg/messages.go
+++ b/ctrl_msg/messages.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/health/handler.go b/health/handler.go
index d55c533ad..dc0324bcb 100644
--- a/health/handler.go
+++ b/health/handler.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/inspect/circuit_detail.go b/inspect/circuit_detail.go
index f61c618c2..437440786 100644
--- a/inspect/circuit_detail.go
+++ b/inspect/circuit_detail.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/inspect/links_inspect_result.go b/inspect/links_inspect_result.go
index 8f738bb26..41e3376e0 100644
--- a/inspect/links_inspect_result.go
+++ b/inspect/links_inspect_result.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/ioc/registry.go b/ioc/registry.go
index 57fc22bbc..f47a9d15b 100644
--- a/ioc/registry.go
+++ b/ioc/registry.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/metrics/channel_reporter.go b/metrics/channel_reporter.go
index d340d6b7e..50857fbd6 100644
--- a/metrics/channel_reporter.go
+++ b/metrics/channel_reporter.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/metrics/events.go b/metrics/events.go
index 5e93a8b39..2ed97ee70 100644
--- a/metrics/events.go
+++ b/metrics/events.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/metrics/pool_metrics.go b/metrics/pool_metrics.go
index 7afea257b..bbbe0099c 100644
--- a/metrics/pool_metrics.go
+++ b/metrics/pool_metrics.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/pb/ctrl_pb/decoder.go b/pb/ctrl_pb/decoder.go
index 1deb370f9..292cc732c 100644
--- a/pb/ctrl_pb/decoder.go
+++ b/pb/ctrl_pb/decoder.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/pb/ctrl_pb/impl.go b/pb/ctrl_pb/impl.go
index 8e936389d..56cf60940 100644
--- a/pb/ctrl_pb/impl.go
+++ b/pb/ctrl_pb/impl.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/pb/mgmt_pb/decoder.go b/pb/mgmt_pb/decoder.go
index 20e1043d3..3528c9e30 100644
--- a/pb/mgmt_pb/decoder.go
+++ b/pb/mgmt_pb/decoder.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/profiler/cpu_darwin.go b/profiler/cpu_darwin.go
index 356af25e1..1f46c466a 100644
--- a/profiler/cpu_darwin.go
+++ b/profiler/cpu_darwin.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/profiler/cpu_linux.go b/profiler/cpu_linux.go
index 7471826bc..bd2adc942 100644
--- a/profiler/cpu_linux.go
+++ b/profiler/cpu_linux.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/profiler/cpu_windows.go b/profiler/cpu_windows.go
index 61fb07c09..db9e8f083 100644
--- a/profiler/cpu_windows.go
+++ b/profiler/cpu_windows.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/profiler/memory.go b/profiler/memory.go
index 53dcfc9e1..7bde9a578 100644
--- a/profiler/memory.go
+++ b/profiler/memory.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/rest_client/circuit/circuit_client.go b/rest_client/circuit/circuit_client.go
index 2dd0d2f84..636004316 100644
--- a/rest_client/circuit/circuit_client.go
+++ b/rest_client/circuit/circuit_client.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/circuit/delete_circuit_parameters.go b/rest_client/circuit/delete_circuit_parameters.go
index 65b5b6821..c9c429bda 100644
--- a/rest_client/circuit/delete_circuit_parameters.go
+++ b/rest_client/circuit/delete_circuit_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/circuit/delete_circuit_responses.go b/rest_client/circuit/delete_circuit_responses.go
index 513d814b4..2765f228f 100644
--- a/rest_client/circuit/delete_circuit_responses.go
+++ b/rest_client/circuit/delete_circuit_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/circuit/detail_circuit_parameters.go b/rest_client/circuit/detail_circuit_parameters.go
index 65e61b3d4..e10e86155 100644
--- a/rest_client/circuit/detail_circuit_parameters.go
+++ b/rest_client/circuit/detail_circuit_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/circuit/detail_circuit_responses.go b/rest_client/circuit/detail_circuit_responses.go
index 13e660cbc..5c599af8b 100644
--- a/rest_client/circuit/detail_circuit_responses.go
+++ b/rest_client/circuit/detail_circuit_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/circuit/list_circuits_parameters.go b/rest_client/circuit/list_circuits_parameters.go
index 9c689f799..8119b9bcc 100644
--- a/rest_client/circuit/list_circuits_parameters.go
+++ b/rest_client/circuit/list_circuits_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/circuit/list_circuits_responses.go b/rest_client/circuit/list_circuits_responses.go
index e1a607524..00f28054d 100644
--- a/rest_client/circuit/list_circuits_responses.go
+++ b/rest_client/circuit/list_circuits_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/database/check_data_integrity_parameters.go b/rest_client/database/check_data_integrity_parameters.go
index 0c69a6d94..0709fa74a 100644
--- a/rest_client/database/check_data_integrity_parameters.go
+++ b/rest_client/database/check_data_integrity_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/database/check_data_integrity_responses.go b/rest_client/database/check_data_integrity_responses.go
index 4c2789793..56b675f8c 100644
--- a/rest_client/database/check_data_integrity_responses.go
+++ b/rest_client/database/check_data_integrity_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/database/create_database_snapshot_parameters.go b/rest_client/database/create_database_snapshot_parameters.go
index ad172b25c..88526af8f 100644
--- a/rest_client/database/create_database_snapshot_parameters.go
+++ b/rest_client/database/create_database_snapshot_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/database/create_database_snapshot_responses.go b/rest_client/database/create_database_snapshot_responses.go
index 9c367cd33..c738d03fb 100644
--- a/rest_client/database/create_database_snapshot_responses.go
+++ b/rest_client/database/create_database_snapshot_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/database/data_integrity_results_parameters.go b/rest_client/database/data_integrity_results_parameters.go
index 5ddf307f7..801fdffc9 100644
--- a/rest_client/database/data_integrity_results_parameters.go
+++ b/rest_client/database/data_integrity_results_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/database/data_integrity_results_responses.go b/rest_client/database/data_integrity_results_responses.go
index 58b969178..e1c0ad576 100644
--- a/rest_client/database/data_integrity_results_responses.go
+++ b/rest_client/database/data_integrity_results_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/database/database_client.go b/rest_client/database/database_client.go
index 5ae32707a..a69195ef2 100644
--- a/rest_client/database/database_client.go
+++ b/rest_client/database/database_client.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/database/fix_data_integrity_parameters.go b/rest_client/database/fix_data_integrity_parameters.go
index 6aca82cfc..2adbd1228 100644
--- a/rest_client/database/fix_data_integrity_parameters.go
+++ b/rest_client/database/fix_data_integrity_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/database/fix_data_integrity_responses.go b/rest_client/database/fix_data_integrity_responses.go
index 51feb585f..543bcca70 100644
--- a/rest_client/database/fix_data_integrity_responses.go
+++ b/rest_client/database/fix_data_integrity_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/inspect/inspect_client.go b/rest_client/inspect/inspect_client.go
index b7560dd2a..f995c6fd5 100644
--- a/rest_client/inspect/inspect_client.go
+++ b/rest_client/inspect/inspect_client.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/inspect/inspect_parameters.go b/rest_client/inspect/inspect_parameters.go
index c5a1cde9c..a2e20469b 100644
--- a/rest_client/inspect/inspect_parameters.go
+++ b/rest_client/inspect/inspect_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/inspect/inspect_responses.go b/rest_client/inspect/inspect_responses.go
index b9ae3994e..069a5c344 100644
--- a/rest_client/inspect/inspect_responses.go
+++ b/rest_client/inspect/inspect_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/link/delete_link_parameters.go b/rest_client/link/delete_link_parameters.go
index 3384d15f5..fe2368fdf 100644
--- a/rest_client/link/delete_link_parameters.go
+++ b/rest_client/link/delete_link_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/link/delete_link_responses.go b/rest_client/link/delete_link_responses.go
index c5c983280..17ebfe779 100644
--- a/rest_client/link/delete_link_responses.go
+++ b/rest_client/link/delete_link_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/link/detail_link_parameters.go b/rest_client/link/detail_link_parameters.go
index 37dc4d0fd..7f9bcdb11 100644
--- a/rest_client/link/detail_link_parameters.go
+++ b/rest_client/link/detail_link_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/link/detail_link_responses.go b/rest_client/link/detail_link_responses.go
index 34635aa7e..bb56e28f0 100644
--- a/rest_client/link/detail_link_responses.go
+++ b/rest_client/link/detail_link_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/link/link_client.go b/rest_client/link/link_client.go
index 74c861c90..6c1034f5a 100644
--- a/rest_client/link/link_client.go
+++ b/rest_client/link/link_client.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/link/list_links_parameters.go b/rest_client/link/list_links_parameters.go
index 4e66ebb9c..f80058307 100644
--- a/rest_client/link/list_links_parameters.go
+++ b/rest_client/link/list_links_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/link/list_links_responses.go b/rest_client/link/list_links_responses.go
index 32ad218f2..cb2ccb1fd 100644
--- a/rest_client/link/list_links_responses.go
+++ b/rest_client/link/list_links_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/link/patch_link_parameters.go b/rest_client/link/patch_link_parameters.go
index 888366dba..0e3c72b00 100644
--- a/rest_client/link/patch_link_parameters.go
+++ b/rest_client/link/patch_link_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/link/patch_link_responses.go b/rest_client/link/patch_link_responses.go
index e24b609dd..5fa3caa9c 100644
--- a/rest_client/link/patch_link_responses.go
+++ b/rest_client/link/patch_link_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/router/create_router_parameters.go b/rest_client/router/create_router_parameters.go
index 53dd7e188..958bf969d 100644
--- a/rest_client/router/create_router_parameters.go
+++ b/rest_client/router/create_router_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/router/create_router_responses.go b/rest_client/router/create_router_responses.go
index ffd9c0d75..05831d914 100644
--- a/rest_client/router/create_router_responses.go
+++ b/rest_client/router/create_router_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/router/delete_router_parameters.go b/rest_client/router/delete_router_parameters.go
index abe45bcf5..a098aa341 100644
--- a/rest_client/router/delete_router_parameters.go
+++ b/rest_client/router/delete_router_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/router/delete_router_responses.go b/rest_client/router/delete_router_responses.go
index 7f47e5af2..f01340d16 100644
--- a/rest_client/router/delete_router_responses.go
+++ b/rest_client/router/delete_router_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/router/detail_router_parameters.go b/rest_client/router/detail_router_parameters.go
index 36d91bf68..c37fa36e2 100644
--- a/rest_client/router/detail_router_parameters.go
+++ b/rest_client/router/detail_router_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/router/detail_router_responses.go b/rest_client/router/detail_router_responses.go
index 3a298fed4..3c36209b1 100644
--- a/rest_client/router/detail_router_responses.go
+++ b/rest_client/router/detail_router_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/router/list_router_terminators_parameters.go b/rest_client/router/list_router_terminators_parameters.go
index f45d61d23..50c85ae77 100644
--- a/rest_client/router/list_router_terminators_parameters.go
+++ b/rest_client/router/list_router_terminators_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/router/list_router_terminators_responses.go b/rest_client/router/list_router_terminators_responses.go
index de33a50cc..66dcdab18 100644
--- a/rest_client/router/list_router_terminators_responses.go
+++ b/rest_client/router/list_router_terminators_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/router/list_routers_parameters.go b/rest_client/router/list_routers_parameters.go
index f28c70254..a59ba4fc4 100644
--- a/rest_client/router/list_routers_parameters.go
+++ b/rest_client/router/list_routers_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/router/list_routers_responses.go b/rest_client/router/list_routers_responses.go
index 2d462768b..e79b01f62 100644
--- a/rest_client/router/list_routers_responses.go
+++ b/rest_client/router/list_routers_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/router/patch_router_parameters.go b/rest_client/router/patch_router_parameters.go
index 3348b4a49..5fc89c9dc 100644
--- a/rest_client/router/patch_router_parameters.go
+++ b/rest_client/router/patch_router_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/router/patch_router_responses.go b/rest_client/router/patch_router_responses.go
index 39ee3f351..1b123044b 100644
--- a/rest_client/router/patch_router_responses.go
+++ b/rest_client/router/patch_router_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/router/router_client.go b/rest_client/router/router_client.go
index 572149882..b96457d69 100644
--- a/rest_client/router/router_client.go
+++ b/rest_client/router/router_client.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/router/update_router_parameters.go b/rest_client/router/update_router_parameters.go
index 09b910ce1..d9944fbe9 100644
--- a/rest_client/router/update_router_parameters.go
+++ b/rest_client/router/update_router_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/router/update_router_responses.go b/rest_client/router/update_router_responses.go
index 0d14a2cb1..0d403666a 100644
--- a/rest_client/router/update_router_responses.go
+++ b/rest_client/router/update_router_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/service/create_service_parameters.go b/rest_client/service/create_service_parameters.go
index 7fab2807d..186befa19 100644
--- a/rest_client/service/create_service_parameters.go
+++ b/rest_client/service/create_service_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/service/create_service_responses.go b/rest_client/service/create_service_responses.go
index 2382dba96..d13c38853 100644
--- a/rest_client/service/create_service_responses.go
+++ b/rest_client/service/create_service_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/service/delete_service_parameters.go b/rest_client/service/delete_service_parameters.go
index e4381338c..5eb86ff71 100644
--- a/rest_client/service/delete_service_parameters.go
+++ b/rest_client/service/delete_service_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/service/delete_service_responses.go b/rest_client/service/delete_service_responses.go
index 633cc7ae5..7c5e39fb7 100644
--- a/rest_client/service/delete_service_responses.go
+++ b/rest_client/service/delete_service_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/service/detail_service_parameters.go b/rest_client/service/detail_service_parameters.go
index 2b6d3bfc5..850a20228 100644
--- a/rest_client/service/detail_service_parameters.go
+++ b/rest_client/service/detail_service_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/service/detail_service_responses.go b/rest_client/service/detail_service_responses.go
index a7060f6ff..9dcc19a0e 100644
--- a/rest_client/service/detail_service_responses.go
+++ b/rest_client/service/detail_service_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/service/list_service_terminators_parameters.go b/rest_client/service/list_service_terminators_parameters.go
index 61702324d..c6024e506 100644
--- a/rest_client/service/list_service_terminators_parameters.go
+++ b/rest_client/service/list_service_terminators_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/service/list_service_terminators_responses.go b/rest_client/service/list_service_terminators_responses.go
index 3d4d85591..2116b7302 100644
--- a/rest_client/service/list_service_terminators_responses.go
+++ b/rest_client/service/list_service_terminators_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/service/list_services_parameters.go b/rest_client/service/list_services_parameters.go
index 4fd7d6617..d4958c076 100644
--- a/rest_client/service/list_services_parameters.go
+++ b/rest_client/service/list_services_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/service/list_services_responses.go b/rest_client/service/list_services_responses.go
index 769614969..046cbef23 100644
--- a/rest_client/service/list_services_responses.go
+++ b/rest_client/service/list_services_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/service/patch_service_parameters.go b/rest_client/service/patch_service_parameters.go
index e8e2ea329..15f84800a 100644
--- a/rest_client/service/patch_service_parameters.go
+++ b/rest_client/service/patch_service_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/service/patch_service_responses.go b/rest_client/service/patch_service_responses.go
index c4bec0b94..5bbaf8ba0 100644
--- a/rest_client/service/patch_service_responses.go
+++ b/rest_client/service/patch_service_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/service/service_client.go b/rest_client/service/service_client.go
index 20bca0c19..2ed794f21 100644
--- a/rest_client/service/service_client.go
+++ b/rest_client/service/service_client.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/service/update_service_parameters.go b/rest_client/service/update_service_parameters.go
index 1e4c8ad27..d578d1afd 100644
--- a/rest_client/service/update_service_parameters.go
+++ b/rest_client/service/update_service_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/service/update_service_responses.go b/rest_client/service/update_service_responses.go
index 51270483a..7e5533ad8 100644
--- a/rest_client/service/update_service_responses.go
+++ b/rest_client/service/update_service_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/terminator/create_terminator_parameters.go b/rest_client/terminator/create_terminator_parameters.go
index 211a40ede..4cccedd90 100644
--- a/rest_client/terminator/create_terminator_parameters.go
+++ b/rest_client/terminator/create_terminator_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/terminator/create_terminator_responses.go b/rest_client/terminator/create_terminator_responses.go
index 9ec724ee7..7c19e7bf8 100644
--- a/rest_client/terminator/create_terminator_responses.go
+++ b/rest_client/terminator/create_terminator_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/terminator/delete_terminator_parameters.go b/rest_client/terminator/delete_terminator_parameters.go
index a15376627..1a5682ed5 100644
--- a/rest_client/terminator/delete_terminator_parameters.go
+++ b/rest_client/terminator/delete_terminator_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/terminator/delete_terminator_responses.go b/rest_client/terminator/delete_terminator_responses.go
index 645ced220..cf838bab7 100644
--- a/rest_client/terminator/delete_terminator_responses.go
+++ b/rest_client/terminator/delete_terminator_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/terminator/detail_terminator_parameters.go b/rest_client/terminator/detail_terminator_parameters.go
index 87b72e0a9..d4f86df30 100644
--- a/rest_client/terminator/detail_terminator_parameters.go
+++ b/rest_client/terminator/detail_terminator_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/terminator/detail_terminator_responses.go b/rest_client/terminator/detail_terminator_responses.go
index 33e58fcba..623e9ded9 100644
--- a/rest_client/terminator/detail_terminator_responses.go
+++ b/rest_client/terminator/detail_terminator_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/terminator/list_terminators_parameters.go b/rest_client/terminator/list_terminators_parameters.go
index 8254fcfff..fd7777db3 100644
--- a/rest_client/terminator/list_terminators_parameters.go
+++ b/rest_client/terminator/list_terminators_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/terminator/list_terminators_responses.go b/rest_client/terminator/list_terminators_responses.go
index c95fee236..69d5bcd7a 100644
--- a/rest_client/terminator/list_terminators_responses.go
+++ b/rest_client/terminator/list_terminators_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/terminator/patch_terminator_parameters.go b/rest_client/terminator/patch_terminator_parameters.go
index 4e1a519f8..030b1a858 100644
--- a/rest_client/terminator/patch_terminator_parameters.go
+++ b/rest_client/terminator/patch_terminator_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/terminator/patch_terminator_responses.go b/rest_client/terminator/patch_terminator_responses.go
index bc2f41d96..56eb53d5e 100644
--- a/rest_client/terminator/patch_terminator_responses.go
+++ b/rest_client/terminator/patch_terminator_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/terminator/terminator_client.go b/rest_client/terminator/terminator_client.go
index 8a53e0f71..e560593a7 100644
--- a/rest_client/terminator/terminator_client.go
+++ b/rest_client/terminator/terminator_client.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/terminator/update_terminator_parameters.go b/rest_client/terminator/update_terminator_parameters.go
index f424aa92b..2b537c9c9 100644
--- a/rest_client/terminator/update_terminator_parameters.go
+++ b/rest_client/terminator/update_terminator_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/terminator/update_terminator_responses.go b/rest_client/terminator/update_terminator_responses.go
index 99b836a96..03880ce52 100644
--- a/rest_client/terminator/update_terminator_responses.go
+++ b/rest_client/terminator/update_terminator_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_client/ziti_fabric_client.go b/rest_client/ziti_fabric_client.go
index 66cd94ba1..4bf0d9f3e 100644
--- a/rest_client/ziti_fabric_client.go
+++ b/rest_client/ziti_fabric_client.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/api_error.go b/rest_model/api_error.go
index 22dfd48e5..8653c326f 100644
--- a/rest_model/api_error.go
+++ b/rest_model/api_error.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/api_error_args.go b/rest_model/api_error_args.go
index 0fa1a2e98..4b61db6cc 100644
--- a/rest_model/api_error_args.go
+++ b/rest_model/api_error_args.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/api_error_cause.go b/rest_model/api_error_cause.go
index 37ed6a17e..a7891e2e2 100644
--- a/rest_model/api_error_cause.go
+++ b/rest_model/api_error_cause.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/api_error_envelope.go b/rest_model/api_error_envelope.go
index da59358ca..5223af154 100644
--- a/rest_model/api_error_envelope.go
+++ b/rest_model/api_error_envelope.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/api_field_error.go b/rest_model/api_field_error.go
index aeeedf5c0..37f4ce0db 100644
--- a/rest_model/api_field_error.go
+++ b/rest_model/api_field_error.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/base_entity.go b/rest_model/base_entity.go
index a92383f41..b3f105b5c 100644
--- a/rest_model/base_entity.go
+++ b/rest_model/base_entity.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/circuit_delete.go b/rest_model/circuit_delete.go
index 9b8bb8bf9..0157c1400 100644
--- a/rest_model/circuit_delete.go
+++ b/rest_model/circuit_delete.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/circuit_detail.go b/rest_model/circuit_detail.go
index 035fc5e5f..5f3a263e8 100644
--- a/rest_model/circuit_detail.go
+++ b/rest_model/circuit_detail.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/circuit_list.go b/rest_model/circuit_list.go
index 17c6f3a3e..630feb7ed 100644
--- a/rest_model/circuit_list.go
+++ b/rest_model/circuit_list.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/create_envelope.go b/rest_model/create_envelope.go
index 0a8263b7e..8a0280a65 100644
--- a/rest_model/create_envelope.go
+++ b/rest_model/create_envelope.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/create_location.go b/rest_model/create_location.go
index e4a12db01..0cb5bec49 100644
--- a/rest_model/create_location.go
+++ b/rest_model/create_location.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/data_integrity_check_detail.go b/rest_model/data_integrity_check_detail.go
index 466f89b71..04f765f88 100644
--- a/rest_model/data_integrity_check_detail.go
+++ b/rest_model/data_integrity_check_detail.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/data_integrity_check_detail_list.go b/rest_model/data_integrity_check_detail_list.go
index 14fd6c7a4..ed0e94b84 100644
--- a/rest_model/data_integrity_check_detail_list.go
+++ b/rest_model/data_integrity_check_detail_list.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/data_integrity_check_details.go b/rest_model/data_integrity_check_details.go
index 68d70bfcd..aa80d1dd8 100644
--- a/rest_model/data_integrity_check_details.go
+++ b/rest_model/data_integrity_check_details.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/data_integrity_check_result_envelope.go b/rest_model/data_integrity_check_result_envelope.go
index 09fb50a7e..40a707566 100644
--- a/rest_model/data_integrity_check_result_envelope.go
+++ b/rest_model/data_integrity_check_result_envelope.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/detail_circuit_envelope.go b/rest_model/detail_circuit_envelope.go
index 4aba0fec4..48dffc7c3 100644
--- a/rest_model/detail_circuit_envelope.go
+++ b/rest_model/detail_circuit_envelope.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/detail_link_envelope.go b/rest_model/detail_link_envelope.go
index 801e71a2c..afdef20c6 100644
--- a/rest_model/detail_link_envelope.go
+++ b/rest_model/detail_link_envelope.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/detail_router_envelope.go b/rest_model/detail_router_envelope.go
index 169d3339d..1e54bd009 100644
--- a/rest_model/detail_router_envelope.go
+++ b/rest_model/detail_router_envelope.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/detail_service_envelope.go b/rest_model/detail_service_envelope.go
index f24da21ed..0a496966b 100644
--- a/rest_model/detail_service_envelope.go
+++ b/rest_model/detail_service_envelope.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/detail_terminator_envelope.go b/rest_model/detail_terminator_envelope.go
index f027b785c..f3054c3ce 100644
--- a/rest_model/detail_terminator_envelope.go
+++ b/rest_model/detail_terminator_envelope.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/empty.go b/rest_model/empty.go
index 7bd63ef35..3ffbceea3 100644
--- a/rest_model/empty.go
+++ b/rest_model/empty.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/entity_ref.go b/rest_model/entity_ref.go
index 2535ead09..e3c36030b 100644
--- a/rest_model/entity_ref.go
+++ b/rest_model/entity_ref.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/inspect_request.go b/rest_model/inspect_request.go
index 966eafef0..c7e06a572 100644
--- a/rest_model/inspect_request.go
+++ b/rest_model/inspect_request.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/inspect_response.go b/rest_model/inspect_response.go
index 67f80587b..afacf9df8 100644
--- a/rest_model/inspect_response.go
+++ b/rest_model/inspect_response.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/inspect_response_value.go b/rest_model/inspect_response_value.go
index 33af0610e..a57248c37 100644
--- a/rest_model/inspect_response_value.go
+++ b/rest_model/inspect_response_value.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/link.go b/rest_model/link.go
index 582ad60a1..fbec31d64 100644
--- a/rest_model/link.go
+++ b/rest_model/link.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/link_detail.go b/rest_model/link_detail.go
index 9a22e0654..8b75648c7 100644
--- a/rest_model/link_detail.go
+++ b/rest_model/link_detail.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/link_list.go b/rest_model/link_list.go
index a9862508c..003dfd1b7 100644
--- a/rest_model/link_list.go
+++ b/rest_model/link_list.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/link_patch.go b/rest_model/link_patch.go
index 89efb3258..6b7f85ee6 100644
--- a/rest_model/link_patch.go
+++ b/rest_model/link_patch.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/links.go b/rest_model/links.go
index cc09e97e6..a8cf81108 100644
--- a/rest_model/links.go
+++ b/rest_model/links.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/list_circuits_envelope.go b/rest_model/list_circuits_envelope.go
index df5ac78d6..b00ea4904 100644
--- a/rest_model/list_circuits_envelope.go
+++ b/rest_model/list_circuits_envelope.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/list_links_envelope.go b/rest_model/list_links_envelope.go
index 2e213ab48..9474c3143 100644
--- a/rest_model/list_links_envelope.go
+++ b/rest_model/list_links_envelope.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/list_routers_envelope.go b/rest_model/list_routers_envelope.go
index dce030bef..9593cf933 100644
--- a/rest_model/list_routers_envelope.go
+++ b/rest_model/list_routers_envelope.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/list_services_envelope.go b/rest_model/list_services_envelope.go
index 73945b63d..7e809b13b 100644
--- a/rest_model/list_services_envelope.go
+++ b/rest_model/list_services_envelope.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/list_terminators_envelope.go b/rest_model/list_terminators_envelope.go
index 27a1cdc4c..29e2c5a52 100644
--- a/rest_model/list_terminators_envelope.go
+++ b/rest_model/list_terminators_envelope.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/meta.go b/rest_model/meta.go
index 1cb9b9223..2f957a3af 100644
--- a/rest_model/meta.go
+++ b/rest_model/meta.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/pagination.go b/rest_model/pagination.go
index 3941fd45b..8c97f9838 100644
--- a/rest_model/pagination.go
+++ b/rest_model/pagination.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/router_create.go b/rest_model/router_create.go
index 352c42247..4c8a4bc27 100644
--- a/rest_model/router_create.go
+++ b/rest_model/router_create.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/router_detail.go b/rest_model/router_detail.go
index 478794014..0302ccab6 100644
--- a/rest_model/router_detail.go
+++ b/rest_model/router_detail.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/router_list.go b/rest_model/router_list.go
index deaee3f1f..88673642b 100644
--- a/rest_model/router_list.go
+++ b/rest_model/router_list.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/router_listener.go b/rest_model/router_listener.go
index 8b98c1d59..d3ad42b18 100644
--- a/rest_model/router_listener.go
+++ b/rest_model/router_listener.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/router_patch.go b/rest_model/router_patch.go
index 48d410405..26e479e4b 100644
--- a/rest_model/router_patch.go
+++ b/rest_model/router_patch.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/router_update.go b/rest_model/router_update.go
index bd047888f..772b03295 100644
--- a/rest_model/router_update.go
+++ b/rest_model/router_update.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/service_create.go b/rest_model/service_create.go
index 8896ca816..21f6f7194 100644
--- a/rest_model/service_create.go
+++ b/rest_model/service_create.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/service_detail.go b/rest_model/service_detail.go
index be3c42477..9497b4da0 100644
--- a/rest_model/service_detail.go
+++ b/rest_model/service_detail.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/service_list.go b/rest_model/service_list.go
index 10e411419..d3224d354 100644
--- a/rest_model/service_list.go
+++ b/rest_model/service_list.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/service_patch.go b/rest_model/service_patch.go
index 68fe3ccb2..fe0958d4b 100644
--- a/rest_model/service_patch.go
+++ b/rest_model/service_patch.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/service_update.go b/rest_model/service_update.go
index ea2242bca..9dd896be3 100644
--- a/rest_model/service_update.go
+++ b/rest_model/service_update.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/sub_tags.go b/rest_model/sub_tags.go
index 1c7edb059..d1f59c0b8 100644
--- a/rest_model/sub_tags.go
+++ b/rest_model/sub_tags.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/tags.go b/rest_model/tags.go
index 5ab8a1d6b..21879d0db 100644
--- a/rest_model/tags.go
+++ b/rest_model/tags.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/terminator_cost.go b/rest_model/terminator_cost.go
index 357916440..39144cc7c 100644
--- a/rest_model/terminator_cost.go
+++ b/rest_model/terminator_cost.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/terminator_cost_map.go b/rest_model/terminator_cost_map.go
index 96dc641c6..adc6f0238 100644
--- a/rest_model/terminator_cost_map.go
+++ b/rest_model/terminator_cost_map.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/terminator_create.go b/rest_model/terminator_create.go
index 65d7164ef..1cf7f7a0a 100644
--- a/rest_model/terminator_create.go
+++ b/rest_model/terminator_create.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/terminator_detail.go b/rest_model/terminator_detail.go
index 089c78796..21eb99512 100644
--- a/rest_model/terminator_detail.go
+++ b/rest_model/terminator_detail.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/terminator_list.go b/rest_model/terminator_list.go
index 4ead7f83e..3d347d4d6 100644
--- a/rest_model/terminator_list.go
+++ b/rest_model/terminator_list.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/terminator_patch.go b/rest_model/terminator_patch.go
index b1ddc5575..ac986aba6 100644
--- a/rest_model/terminator_patch.go
+++ b/rest_model/terminator_patch.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/terminator_precedence.go b/rest_model/terminator_precedence.go
index 20ed96bd0..0159ecfe5 100644
--- a/rest_model/terminator_precedence.go
+++ b/rest_model/terminator_precedence.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/terminator_precedence_map.go b/rest_model/terminator_precedence_map.go
index ae9e45ff7..b782c9f9d 100644
--- a/rest_model/terminator_precedence_map.go
+++ b/rest_model/terminator_precedence_map.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/terminator_update.go b/rest_model/terminator_update.go
index dd275821a..3ca4fd173 100644
--- a/rest_model/terminator_update.go
+++ b/rest_model/terminator_update.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_model/version_info.go b/rest_model/version_info.go
index ff5d9b0da..3863461ec 100644
--- a/rest_model/version_info.go
+++ b/rest_model/version_info.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/configure_ziti_fabric.go b/rest_server/configure_ziti_fabric.go
index b84bf9308..53b6d7520 100644
--- a/rest_server/configure_ziti_fabric.go
+++ b/rest_server/configure_ziti_fabric.go
@@ -1,7 +1,7 @@
 // This file is safe to edit. Once it exists it will not be overwritten
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/doc.go b/rest_server/doc.go
index b86ba03d9..d50dba9fd 100644
--- a/rest_server/doc.go
+++ b/rest_server/doc.go
@@ -1,6 +1,6 @@
 // Code generated by go-swagger; DO NOT EDIT.
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/embedded_spec.go b/rest_server/embedded_spec.go
index 628fc8ebb..ca4f07de3 100644
--- a/rest_server/embedded_spec.go
+++ b/rest_server/embedded_spec.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/circuit/delete_circuit.go b/rest_server/operations/circuit/delete_circuit.go
index ccd458c55..abdde6ed6 100644
--- a/rest_server/operations/circuit/delete_circuit.go
+++ b/rest_server/operations/circuit/delete_circuit.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/circuit/delete_circuit_parameters.go b/rest_server/operations/circuit/delete_circuit_parameters.go
index 580c47a79..b1f68906e 100644
--- a/rest_server/operations/circuit/delete_circuit_parameters.go
+++ b/rest_server/operations/circuit/delete_circuit_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/circuit/delete_circuit_responses.go b/rest_server/operations/circuit/delete_circuit_responses.go
index 83fbe1df7..a6591e155 100644
--- a/rest_server/operations/circuit/delete_circuit_responses.go
+++ b/rest_server/operations/circuit/delete_circuit_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/circuit/delete_circuit_urlbuilder.go b/rest_server/operations/circuit/delete_circuit_urlbuilder.go
index b58fb465c..bf45617a1 100644
--- a/rest_server/operations/circuit/delete_circuit_urlbuilder.go
+++ b/rest_server/operations/circuit/delete_circuit_urlbuilder.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/circuit/detail_circuit.go b/rest_server/operations/circuit/detail_circuit.go
index b10badfe4..12cf786e5 100644
--- a/rest_server/operations/circuit/detail_circuit.go
+++ b/rest_server/operations/circuit/detail_circuit.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/circuit/detail_circuit_parameters.go b/rest_server/operations/circuit/detail_circuit_parameters.go
index b589c423b..6736dcf75 100644
--- a/rest_server/operations/circuit/detail_circuit_parameters.go
+++ b/rest_server/operations/circuit/detail_circuit_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/circuit/detail_circuit_responses.go b/rest_server/operations/circuit/detail_circuit_responses.go
index 17c2d54fc..c0bc95fa1 100644
--- a/rest_server/operations/circuit/detail_circuit_responses.go
+++ b/rest_server/operations/circuit/detail_circuit_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/circuit/detail_circuit_urlbuilder.go b/rest_server/operations/circuit/detail_circuit_urlbuilder.go
index 74eb73139..30656ca2c 100644
--- a/rest_server/operations/circuit/detail_circuit_urlbuilder.go
+++ b/rest_server/operations/circuit/detail_circuit_urlbuilder.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/circuit/list_circuits.go b/rest_server/operations/circuit/list_circuits.go
index b0b45f982..782e26194 100644
--- a/rest_server/operations/circuit/list_circuits.go
+++ b/rest_server/operations/circuit/list_circuits.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/circuit/list_circuits_parameters.go b/rest_server/operations/circuit/list_circuits_parameters.go
index 7b59aa5db..b7e885721 100644
--- a/rest_server/operations/circuit/list_circuits_parameters.go
+++ b/rest_server/operations/circuit/list_circuits_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/circuit/list_circuits_responses.go b/rest_server/operations/circuit/list_circuits_responses.go
index 0c59912fe..bd6c25f7d 100644
--- a/rest_server/operations/circuit/list_circuits_responses.go
+++ b/rest_server/operations/circuit/list_circuits_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/circuit/list_circuits_urlbuilder.go b/rest_server/operations/circuit/list_circuits_urlbuilder.go
index 38e1fbd39..5b2ae84c2 100644
--- a/rest_server/operations/circuit/list_circuits_urlbuilder.go
+++ b/rest_server/operations/circuit/list_circuits_urlbuilder.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/database/check_data_integrity.go b/rest_server/operations/database/check_data_integrity.go
index a07fa0204..b9adacad6 100644
--- a/rest_server/operations/database/check_data_integrity.go
+++ b/rest_server/operations/database/check_data_integrity.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/database/check_data_integrity_parameters.go b/rest_server/operations/database/check_data_integrity_parameters.go
index a0877bed2..a35cacd3d 100644
--- a/rest_server/operations/database/check_data_integrity_parameters.go
+++ b/rest_server/operations/database/check_data_integrity_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/database/check_data_integrity_responses.go b/rest_server/operations/database/check_data_integrity_responses.go
index 8f7fb57d4..60c31a1ab 100644
--- a/rest_server/operations/database/check_data_integrity_responses.go
+++ b/rest_server/operations/database/check_data_integrity_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/database/check_data_integrity_urlbuilder.go b/rest_server/operations/database/check_data_integrity_urlbuilder.go
index 284cafba3..d599a6f85 100644
--- a/rest_server/operations/database/check_data_integrity_urlbuilder.go
+++ b/rest_server/operations/database/check_data_integrity_urlbuilder.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/database/create_database_snapshot.go b/rest_server/operations/database/create_database_snapshot.go
index 219664fca..8e03b399f 100644
--- a/rest_server/operations/database/create_database_snapshot.go
+++ b/rest_server/operations/database/create_database_snapshot.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/database/create_database_snapshot_parameters.go b/rest_server/operations/database/create_database_snapshot_parameters.go
index fe058c542..7d225fac2 100644
--- a/rest_server/operations/database/create_database_snapshot_parameters.go
+++ b/rest_server/operations/database/create_database_snapshot_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/database/create_database_snapshot_responses.go b/rest_server/operations/database/create_database_snapshot_responses.go
index a1a3b07fa..f3b19caf8 100644
--- a/rest_server/operations/database/create_database_snapshot_responses.go
+++ b/rest_server/operations/database/create_database_snapshot_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/database/create_database_snapshot_urlbuilder.go b/rest_server/operations/database/create_database_snapshot_urlbuilder.go
index 4998214a1..94db70623 100644
--- a/rest_server/operations/database/create_database_snapshot_urlbuilder.go
+++ b/rest_server/operations/database/create_database_snapshot_urlbuilder.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/database/data_integrity_results.go b/rest_server/operations/database/data_integrity_results.go
index 7bb1d6577..648f178e8 100644
--- a/rest_server/operations/database/data_integrity_results.go
+++ b/rest_server/operations/database/data_integrity_results.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/database/data_integrity_results_parameters.go b/rest_server/operations/database/data_integrity_results_parameters.go
index ecb5c482b..9e50495ba 100644
--- a/rest_server/operations/database/data_integrity_results_parameters.go
+++ b/rest_server/operations/database/data_integrity_results_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/database/data_integrity_results_responses.go b/rest_server/operations/database/data_integrity_results_responses.go
index a73cf36e6..e2b0c6b97 100644
--- a/rest_server/operations/database/data_integrity_results_responses.go
+++ b/rest_server/operations/database/data_integrity_results_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/database/data_integrity_results_urlbuilder.go b/rest_server/operations/database/data_integrity_results_urlbuilder.go
index afcdf6c4a..51ff407a2 100644
--- a/rest_server/operations/database/data_integrity_results_urlbuilder.go
+++ b/rest_server/operations/database/data_integrity_results_urlbuilder.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/database/fix_data_integrity.go b/rest_server/operations/database/fix_data_integrity.go
index 10fd0ec8f..9a9d91127 100644
--- a/rest_server/operations/database/fix_data_integrity.go
+++ b/rest_server/operations/database/fix_data_integrity.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/database/fix_data_integrity_parameters.go b/rest_server/operations/database/fix_data_integrity_parameters.go
index 6b4aa690b..de460e405 100644
--- a/rest_server/operations/database/fix_data_integrity_parameters.go
+++ b/rest_server/operations/database/fix_data_integrity_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/database/fix_data_integrity_responses.go b/rest_server/operations/database/fix_data_integrity_responses.go
index 64b0c8034..f91d209cf 100644
--- a/rest_server/operations/database/fix_data_integrity_responses.go
+++ b/rest_server/operations/database/fix_data_integrity_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/database/fix_data_integrity_urlbuilder.go b/rest_server/operations/database/fix_data_integrity_urlbuilder.go
index 161b25721..cf5823b52 100644
--- a/rest_server/operations/database/fix_data_integrity_urlbuilder.go
+++ b/rest_server/operations/database/fix_data_integrity_urlbuilder.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/inspect/inspect.go b/rest_server/operations/inspect/inspect.go
index c009b665a..5217e3de8 100644
--- a/rest_server/operations/inspect/inspect.go
+++ b/rest_server/operations/inspect/inspect.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/inspect/inspect_parameters.go b/rest_server/operations/inspect/inspect_parameters.go
index 6bb8fe7d5..3206152cc 100644
--- a/rest_server/operations/inspect/inspect_parameters.go
+++ b/rest_server/operations/inspect/inspect_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/inspect/inspect_responses.go b/rest_server/operations/inspect/inspect_responses.go
index 33b7dfaf2..c9e0f774c 100644
--- a/rest_server/operations/inspect/inspect_responses.go
+++ b/rest_server/operations/inspect/inspect_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/inspect/inspect_urlbuilder.go b/rest_server/operations/inspect/inspect_urlbuilder.go
index 260c5bce6..8236b7410 100644
--- a/rest_server/operations/inspect/inspect_urlbuilder.go
+++ b/rest_server/operations/inspect/inspect_urlbuilder.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/link/delete_link.go b/rest_server/operations/link/delete_link.go
index 7f4c23ea7..cbf14889d 100644
--- a/rest_server/operations/link/delete_link.go
+++ b/rest_server/operations/link/delete_link.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/link/delete_link_parameters.go b/rest_server/operations/link/delete_link_parameters.go
index ad37694c9..eb27b2c7d 100644
--- a/rest_server/operations/link/delete_link_parameters.go
+++ b/rest_server/operations/link/delete_link_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/link/delete_link_responses.go b/rest_server/operations/link/delete_link_responses.go
index 904afccbf..47496650c 100644
--- a/rest_server/operations/link/delete_link_responses.go
+++ b/rest_server/operations/link/delete_link_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/link/delete_link_urlbuilder.go b/rest_server/operations/link/delete_link_urlbuilder.go
index a7b29d54e..573a41bda 100644
--- a/rest_server/operations/link/delete_link_urlbuilder.go
+++ b/rest_server/operations/link/delete_link_urlbuilder.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/link/detail_link.go b/rest_server/operations/link/detail_link.go
index e4f77ca01..ce24ff6f9 100644
--- a/rest_server/operations/link/detail_link.go
+++ b/rest_server/operations/link/detail_link.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/link/detail_link_parameters.go b/rest_server/operations/link/detail_link_parameters.go
index 4b1b682a2..770b8e67d 100644
--- a/rest_server/operations/link/detail_link_parameters.go
+++ b/rest_server/operations/link/detail_link_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/link/detail_link_responses.go b/rest_server/operations/link/detail_link_responses.go
index 1581b941a..3f908db27 100644
--- a/rest_server/operations/link/detail_link_responses.go
+++ b/rest_server/operations/link/detail_link_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/link/detail_link_urlbuilder.go b/rest_server/operations/link/detail_link_urlbuilder.go
index 2453aa4d1..3cc229d8a 100644
--- a/rest_server/operations/link/detail_link_urlbuilder.go
+++ b/rest_server/operations/link/detail_link_urlbuilder.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/link/list_links.go b/rest_server/operations/link/list_links.go
index 88c51ff49..489a5d3a3 100644
--- a/rest_server/operations/link/list_links.go
+++ b/rest_server/operations/link/list_links.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/link/list_links_parameters.go b/rest_server/operations/link/list_links_parameters.go
index 3238d957d..a37a8a8fd 100644
--- a/rest_server/operations/link/list_links_parameters.go
+++ b/rest_server/operations/link/list_links_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/link/list_links_responses.go b/rest_server/operations/link/list_links_responses.go
index 1cee1e679..ce806d5c2 100644
--- a/rest_server/operations/link/list_links_responses.go
+++ b/rest_server/operations/link/list_links_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/link/list_links_urlbuilder.go b/rest_server/operations/link/list_links_urlbuilder.go
index 8bcef41c8..54009ded7 100644
--- a/rest_server/operations/link/list_links_urlbuilder.go
+++ b/rest_server/operations/link/list_links_urlbuilder.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/link/patch_link.go b/rest_server/operations/link/patch_link.go
index 05a514797..7765725b1 100644
--- a/rest_server/operations/link/patch_link.go
+++ b/rest_server/operations/link/patch_link.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/link/patch_link_parameters.go b/rest_server/operations/link/patch_link_parameters.go
index 25cce14b0..ca9a812dc 100644
--- a/rest_server/operations/link/patch_link_parameters.go
+++ b/rest_server/operations/link/patch_link_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/link/patch_link_responses.go b/rest_server/operations/link/patch_link_responses.go
index a9da81ba0..688fa961d 100644
--- a/rest_server/operations/link/patch_link_responses.go
+++ b/rest_server/operations/link/patch_link_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/link/patch_link_urlbuilder.go b/rest_server/operations/link/patch_link_urlbuilder.go
index 573476c46..e28b148d7 100644
--- a/rest_server/operations/link/patch_link_urlbuilder.go
+++ b/rest_server/operations/link/patch_link_urlbuilder.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/router/create_router.go b/rest_server/operations/router/create_router.go
index 067504a64..b781aa7e1 100644
--- a/rest_server/operations/router/create_router.go
+++ b/rest_server/operations/router/create_router.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/router/create_router_parameters.go b/rest_server/operations/router/create_router_parameters.go
index 8fcb2d52f..671ea8353 100644
--- a/rest_server/operations/router/create_router_parameters.go
+++ b/rest_server/operations/router/create_router_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/router/create_router_responses.go b/rest_server/operations/router/create_router_responses.go
index c293ca3bb..420485fd5 100644
--- a/rest_server/operations/router/create_router_responses.go
+++ b/rest_server/operations/router/create_router_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/router/create_router_urlbuilder.go b/rest_server/operations/router/create_router_urlbuilder.go
index be9126018..053a6eab6 100644
--- a/rest_server/operations/router/create_router_urlbuilder.go
+++ b/rest_server/operations/router/create_router_urlbuilder.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/router/delete_router.go b/rest_server/operations/router/delete_router.go
index 7d04b63ee..6fbbc04be 100644
--- a/rest_server/operations/router/delete_router.go
+++ b/rest_server/operations/router/delete_router.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/router/delete_router_parameters.go b/rest_server/operations/router/delete_router_parameters.go
index f96a3eac1..911d79ec4 100644
--- a/rest_server/operations/router/delete_router_parameters.go
+++ b/rest_server/operations/router/delete_router_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/router/delete_router_responses.go b/rest_server/operations/router/delete_router_responses.go
index 7373bcf22..1285e3e51 100644
--- a/rest_server/operations/router/delete_router_responses.go
+++ b/rest_server/operations/router/delete_router_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/router/delete_router_urlbuilder.go b/rest_server/operations/router/delete_router_urlbuilder.go
index 8ba331684..70926f8ce 100644
--- a/rest_server/operations/router/delete_router_urlbuilder.go
+++ b/rest_server/operations/router/delete_router_urlbuilder.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/router/detail_router.go b/rest_server/operations/router/detail_router.go
index c62df96c5..395338b98 100644
--- a/rest_server/operations/router/detail_router.go
+++ b/rest_server/operations/router/detail_router.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/router/detail_router_parameters.go b/rest_server/operations/router/detail_router_parameters.go
index f1080bd1a..de34790c1 100644
--- a/rest_server/operations/router/detail_router_parameters.go
+++ b/rest_server/operations/router/detail_router_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/router/detail_router_responses.go b/rest_server/operations/router/detail_router_responses.go
index a29a2eed6..290c78741 100644
--- a/rest_server/operations/router/detail_router_responses.go
+++ b/rest_server/operations/router/detail_router_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/router/detail_router_urlbuilder.go b/rest_server/operations/router/detail_router_urlbuilder.go
index f78dd2877..20a8ca456 100644
--- a/rest_server/operations/router/detail_router_urlbuilder.go
+++ b/rest_server/operations/router/detail_router_urlbuilder.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/router/list_router_terminators.go b/rest_server/operations/router/list_router_terminators.go
index 7361e2034..328e04929 100644
--- a/rest_server/operations/router/list_router_terminators.go
+++ b/rest_server/operations/router/list_router_terminators.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/router/list_router_terminators_parameters.go b/rest_server/operations/router/list_router_terminators_parameters.go
index 0f04a1ded..4b54cd9e1 100644
--- a/rest_server/operations/router/list_router_terminators_parameters.go
+++ b/rest_server/operations/router/list_router_terminators_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/router/list_router_terminators_responses.go b/rest_server/operations/router/list_router_terminators_responses.go
index 45ecb28b5..74034e063 100644
--- a/rest_server/operations/router/list_router_terminators_responses.go
+++ b/rest_server/operations/router/list_router_terminators_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/router/list_router_terminators_urlbuilder.go b/rest_server/operations/router/list_router_terminators_urlbuilder.go
index 873fef6ec..45c29d250 100644
--- a/rest_server/operations/router/list_router_terminators_urlbuilder.go
+++ b/rest_server/operations/router/list_router_terminators_urlbuilder.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/router/list_routers.go b/rest_server/operations/router/list_routers.go
index 9dfb76fd8..4481726c9 100644
--- a/rest_server/operations/router/list_routers.go
+++ b/rest_server/operations/router/list_routers.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/router/list_routers_parameters.go b/rest_server/operations/router/list_routers_parameters.go
index 7fa1c0196..3af933b74 100644
--- a/rest_server/operations/router/list_routers_parameters.go
+++ b/rest_server/operations/router/list_routers_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/router/list_routers_responses.go b/rest_server/operations/router/list_routers_responses.go
index e639edee9..be26d3d63 100644
--- a/rest_server/operations/router/list_routers_responses.go
+++ b/rest_server/operations/router/list_routers_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/router/list_routers_urlbuilder.go b/rest_server/operations/router/list_routers_urlbuilder.go
index 8b9c5ebdc..423d7542a 100644
--- a/rest_server/operations/router/list_routers_urlbuilder.go
+++ b/rest_server/operations/router/list_routers_urlbuilder.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/router/patch_router.go b/rest_server/operations/router/patch_router.go
index b0ea1ad3b..c4cf2a63f 100644
--- a/rest_server/operations/router/patch_router.go
+++ b/rest_server/operations/router/patch_router.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/router/patch_router_parameters.go b/rest_server/operations/router/patch_router_parameters.go
index bd145d5da..8e63cd88a 100644
--- a/rest_server/operations/router/patch_router_parameters.go
+++ b/rest_server/operations/router/patch_router_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/router/patch_router_responses.go b/rest_server/operations/router/patch_router_responses.go
index a45c38b8a..06cd5b014 100644
--- a/rest_server/operations/router/patch_router_responses.go
+++ b/rest_server/operations/router/patch_router_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/router/patch_router_urlbuilder.go b/rest_server/operations/router/patch_router_urlbuilder.go
index dfdae10a1..27728897a 100644
--- a/rest_server/operations/router/patch_router_urlbuilder.go
+++ b/rest_server/operations/router/patch_router_urlbuilder.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/router/update_router.go b/rest_server/operations/router/update_router.go
index f0d2b346d..7af94c4c6 100644
--- a/rest_server/operations/router/update_router.go
+++ b/rest_server/operations/router/update_router.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/router/update_router_parameters.go b/rest_server/operations/router/update_router_parameters.go
index 8101a82fb..51fc04613 100644
--- a/rest_server/operations/router/update_router_parameters.go
+++ b/rest_server/operations/router/update_router_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/router/update_router_responses.go b/rest_server/operations/router/update_router_responses.go
index 5cf1c6fe3..4ca762e89 100644
--- a/rest_server/operations/router/update_router_responses.go
+++ b/rest_server/operations/router/update_router_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/router/update_router_urlbuilder.go b/rest_server/operations/router/update_router_urlbuilder.go
index d7043d7f6..b3d8e0869 100644
--- a/rest_server/operations/router/update_router_urlbuilder.go
+++ b/rest_server/operations/router/update_router_urlbuilder.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/service/create_service.go b/rest_server/operations/service/create_service.go
index edb2daaa1..8e976e7bb 100644
--- a/rest_server/operations/service/create_service.go
+++ b/rest_server/operations/service/create_service.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/service/create_service_parameters.go b/rest_server/operations/service/create_service_parameters.go
index 7e343683c..93cc8fa94 100644
--- a/rest_server/operations/service/create_service_parameters.go
+++ b/rest_server/operations/service/create_service_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/service/create_service_responses.go b/rest_server/operations/service/create_service_responses.go
index 06ae021ff..7ba6bf6d9 100644
--- a/rest_server/operations/service/create_service_responses.go
+++ b/rest_server/operations/service/create_service_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/service/create_service_urlbuilder.go b/rest_server/operations/service/create_service_urlbuilder.go
index a9d69a75a..d6962154e 100644
--- a/rest_server/operations/service/create_service_urlbuilder.go
+++ b/rest_server/operations/service/create_service_urlbuilder.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/service/delete_service.go b/rest_server/operations/service/delete_service.go
index 14565ca17..20c3e95a6 100644
--- a/rest_server/operations/service/delete_service.go
+++ b/rest_server/operations/service/delete_service.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/service/delete_service_parameters.go b/rest_server/operations/service/delete_service_parameters.go
index b58e95631..57bc96fc3 100644
--- a/rest_server/operations/service/delete_service_parameters.go
+++ b/rest_server/operations/service/delete_service_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/service/delete_service_responses.go b/rest_server/operations/service/delete_service_responses.go
index 0b55dc487..62c8f81d1 100644
--- a/rest_server/operations/service/delete_service_responses.go
+++ b/rest_server/operations/service/delete_service_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/service/delete_service_urlbuilder.go b/rest_server/operations/service/delete_service_urlbuilder.go
index aa0ed93af..020951121 100644
--- a/rest_server/operations/service/delete_service_urlbuilder.go
+++ b/rest_server/operations/service/delete_service_urlbuilder.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/service/detail_service.go b/rest_server/operations/service/detail_service.go
index 993c8aef9..047ea25c0 100644
--- a/rest_server/operations/service/detail_service.go
+++ b/rest_server/operations/service/detail_service.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/service/detail_service_parameters.go b/rest_server/operations/service/detail_service_parameters.go
index c7baaf646..8ea426c12 100644
--- a/rest_server/operations/service/detail_service_parameters.go
+++ b/rest_server/operations/service/detail_service_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/service/detail_service_responses.go b/rest_server/operations/service/detail_service_responses.go
index e85f3083e..fd574e6df 100644
--- a/rest_server/operations/service/detail_service_responses.go
+++ b/rest_server/operations/service/detail_service_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/service/detail_service_urlbuilder.go b/rest_server/operations/service/detail_service_urlbuilder.go
index b93ea3bab..5bc96626d 100644
--- a/rest_server/operations/service/detail_service_urlbuilder.go
+++ b/rest_server/operations/service/detail_service_urlbuilder.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/service/list_service_terminators.go b/rest_server/operations/service/list_service_terminators.go
index 571fd5fca..9c8f8e491 100644
--- a/rest_server/operations/service/list_service_terminators.go
+++ b/rest_server/operations/service/list_service_terminators.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/service/list_service_terminators_parameters.go b/rest_server/operations/service/list_service_terminators_parameters.go
index b7d66e76b..fc0a459fc 100644
--- a/rest_server/operations/service/list_service_terminators_parameters.go
+++ b/rest_server/operations/service/list_service_terminators_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/service/list_service_terminators_responses.go b/rest_server/operations/service/list_service_terminators_responses.go
index fd798b935..7cf0974bf 100644
--- a/rest_server/operations/service/list_service_terminators_responses.go
+++ b/rest_server/operations/service/list_service_terminators_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/service/list_service_terminators_urlbuilder.go b/rest_server/operations/service/list_service_terminators_urlbuilder.go
index 904ada384..ac608f09c 100644
--- a/rest_server/operations/service/list_service_terminators_urlbuilder.go
+++ b/rest_server/operations/service/list_service_terminators_urlbuilder.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/service/list_services.go b/rest_server/operations/service/list_services.go
index 5bb2b9ac0..997229ad6 100644
--- a/rest_server/operations/service/list_services.go
+++ b/rest_server/operations/service/list_services.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/service/list_services_parameters.go b/rest_server/operations/service/list_services_parameters.go
index 8eb71e07b..08ef8984a 100644
--- a/rest_server/operations/service/list_services_parameters.go
+++ b/rest_server/operations/service/list_services_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/service/list_services_responses.go b/rest_server/operations/service/list_services_responses.go
index 21c2da540..2a85d190f 100644
--- a/rest_server/operations/service/list_services_responses.go
+++ b/rest_server/operations/service/list_services_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/service/list_services_urlbuilder.go b/rest_server/operations/service/list_services_urlbuilder.go
index 70d04852a..64ed9ef81 100644
--- a/rest_server/operations/service/list_services_urlbuilder.go
+++ b/rest_server/operations/service/list_services_urlbuilder.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/service/patch_service.go b/rest_server/operations/service/patch_service.go
index fdcb4c88d..7729648bd 100644
--- a/rest_server/operations/service/patch_service.go
+++ b/rest_server/operations/service/patch_service.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/service/patch_service_parameters.go b/rest_server/operations/service/patch_service_parameters.go
index cb3e7b33a..7e7f7abef 100644
--- a/rest_server/operations/service/patch_service_parameters.go
+++ b/rest_server/operations/service/patch_service_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/service/patch_service_responses.go b/rest_server/operations/service/patch_service_responses.go
index 56759ef56..d72e4e6ea 100644
--- a/rest_server/operations/service/patch_service_responses.go
+++ b/rest_server/operations/service/patch_service_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/service/patch_service_urlbuilder.go b/rest_server/operations/service/patch_service_urlbuilder.go
index ac6586018..c96007b85 100644
--- a/rest_server/operations/service/patch_service_urlbuilder.go
+++ b/rest_server/operations/service/patch_service_urlbuilder.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/service/update_service.go b/rest_server/operations/service/update_service.go
index 69b6af3cd..162de1215 100644
--- a/rest_server/operations/service/update_service.go
+++ b/rest_server/operations/service/update_service.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/service/update_service_parameters.go b/rest_server/operations/service/update_service_parameters.go
index 3e7eb4f4d..443506a61 100644
--- a/rest_server/operations/service/update_service_parameters.go
+++ b/rest_server/operations/service/update_service_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/service/update_service_responses.go b/rest_server/operations/service/update_service_responses.go
index 5e08d7ad5..87729bf53 100644
--- a/rest_server/operations/service/update_service_responses.go
+++ b/rest_server/operations/service/update_service_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/service/update_service_urlbuilder.go b/rest_server/operations/service/update_service_urlbuilder.go
index 5e513bcc3..c891ae13e 100644
--- a/rest_server/operations/service/update_service_urlbuilder.go
+++ b/rest_server/operations/service/update_service_urlbuilder.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/terminator/create_terminator.go b/rest_server/operations/terminator/create_terminator.go
index a1be0b073..e7186eb83 100644
--- a/rest_server/operations/terminator/create_terminator.go
+++ b/rest_server/operations/terminator/create_terminator.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/terminator/create_terminator_parameters.go b/rest_server/operations/terminator/create_terminator_parameters.go
index a7afde3de..2077edea8 100644
--- a/rest_server/operations/terminator/create_terminator_parameters.go
+++ b/rest_server/operations/terminator/create_terminator_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/terminator/create_terminator_responses.go b/rest_server/operations/terminator/create_terminator_responses.go
index 098b45738..8748b47fc 100644
--- a/rest_server/operations/terminator/create_terminator_responses.go
+++ b/rest_server/operations/terminator/create_terminator_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/terminator/create_terminator_urlbuilder.go b/rest_server/operations/terminator/create_terminator_urlbuilder.go
index 6fe29e9ba..145a6ad3f 100644
--- a/rest_server/operations/terminator/create_terminator_urlbuilder.go
+++ b/rest_server/operations/terminator/create_terminator_urlbuilder.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/terminator/delete_terminator.go b/rest_server/operations/terminator/delete_terminator.go
index bfed0acf6..7db563539 100644
--- a/rest_server/operations/terminator/delete_terminator.go
+++ b/rest_server/operations/terminator/delete_terminator.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/terminator/delete_terminator_parameters.go b/rest_server/operations/terminator/delete_terminator_parameters.go
index 65ffbdcb0..25e697f5c 100644
--- a/rest_server/operations/terminator/delete_terminator_parameters.go
+++ b/rest_server/operations/terminator/delete_terminator_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/terminator/delete_terminator_responses.go b/rest_server/operations/terminator/delete_terminator_responses.go
index 10689ef2f..b239f97a3 100644
--- a/rest_server/operations/terminator/delete_terminator_responses.go
+++ b/rest_server/operations/terminator/delete_terminator_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/terminator/delete_terminator_urlbuilder.go b/rest_server/operations/terminator/delete_terminator_urlbuilder.go
index 65fc16828..4e9933ab8 100644
--- a/rest_server/operations/terminator/delete_terminator_urlbuilder.go
+++ b/rest_server/operations/terminator/delete_terminator_urlbuilder.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/terminator/detail_terminator.go b/rest_server/operations/terminator/detail_terminator.go
index b86c89774..a6ac2ba1a 100644
--- a/rest_server/operations/terminator/detail_terminator.go
+++ b/rest_server/operations/terminator/detail_terminator.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/terminator/detail_terminator_parameters.go b/rest_server/operations/terminator/detail_terminator_parameters.go
index cff8a8de4..1df8cd1e9 100644
--- a/rest_server/operations/terminator/detail_terminator_parameters.go
+++ b/rest_server/operations/terminator/detail_terminator_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/terminator/detail_terminator_responses.go b/rest_server/operations/terminator/detail_terminator_responses.go
index b4a78d9e1..bf1d78e9a 100644
--- a/rest_server/operations/terminator/detail_terminator_responses.go
+++ b/rest_server/operations/terminator/detail_terminator_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/terminator/detail_terminator_urlbuilder.go b/rest_server/operations/terminator/detail_terminator_urlbuilder.go
index aab5e6902..fbfa667ab 100644
--- a/rest_server/operations/terminator/detail_terminator_urlbuilder.go
+++ b/rest_server/operations/terminator/detail_terminator_urlbuilder.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/terminator/list_terminators.go b/rest_server/operations/terminator/list_terminators.go
index 17b3037c8..2bfc4e7c0 100644
--- a/rest_server/operations/terminator/list_terminators.go
+++ b/rest_server/operations/terminator/list_terminators.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/terminator/list_terminators_parameters.go b/rest_server/operations/terminator/list_terminators_parameters.go
index 84fc1e620..356a72c7f 100644
--- a/rest_server/operations/terminator/list_terminators_parameters.go
+++ b/rest_server/operations/terminator/list_terminators_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/terminator/list_terminators_responses.go b/rest_server/operations/terminator/list_terminators_responses.go
index 3946ea27c..e0d5f786a 100644
--- a/rest_server/operations/terminator/list_terminators_responses.go
+++ b/rest_server/operations/terminator/list_terminators_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/terminator/list_terminators_urlbuilder.go b/rest_server/operations/terminator/list_terminators_urlbuilder.go
index 80b7ee58f..40edea6a2 100644
--- a/rest_server/operations/terminator/list_terminators_urlbuilder.go
+++ b/rest_server/operations/terminator/list_terminators_urlbuilder.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/terminator/patch_terminator.go b/rest_server/operations/terminator/patch_terminator.go
index c10c2b744..40be1791d 100644
--- a/rest_server/operations/terminator/patch_terminator.go
+++ b/rest_server/operations/terminator/patch_terminator.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/terminator/patch_terminator_parameters.go b/rest_server/operations/terminator/patch_terminator_parameters.go
index dd0f85ce8..11b437faf 100644
--- a/rest_server/operations/terminator/patch_terminator_parameters.go
+++ b/rest_server/operations/terminator/patch_terminator_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/terminator/patch_terminator_responses.go b/rest_server/operations/terminator/patch_terminator_responses.go
index d9f840bd1..00214bb17 100644
--- a/rest_server/operations/terminator/patch_terminator_responses.go
+++ b/rest_server/operations/terminator/patch_terminator_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/terminator/patch_terminator_urlbuilder.go b/rest_server/operations/terminator/patch_terminator_urlbuilder.go
index bc1733f98..5a834fa99 100644
--- a/rest_server/operations/terminator/patch_terminator_urlbuilder.go
+++ b/rest_server/operations/terminator/patch_terminator_urlbuilder.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/terminator/update_terminator.go b/rest_server/operations/terminator/update_terminator.go
index 815265780..8fa9f6ec1 100644
--- a/rest_server/operations/terminator/update_terminator.go
+++ b/rest_server/operations/terminator/update_terminator.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/terminator/update_terminator_parameters.go b/rest_server/operations/terminator/update_terminator_parameters.go
index 86a6f815f..6cb8bb74c 100644
--- a/rest_server/operations/terminator/update_terminator_parameters.go
+++ b/rest_server/operations/terminator/update_terminator_parameters.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/terminator/update_terminator_responses.go b/rest_server/operations/terminator/update_terminator_responses.go
index e96f43ab6..bfecd5ab1 100644
--- a/rest_server/operations/terminator/update_terminator_responses.go
+++ b/rest_server/operations/terminator/update_terminator_responses.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/terminator/update_terminator_urlbuilder.go b/rest_server/operations/terminator/update_terminator_urlbuilder.go
index 557510f1f..ecb390de0 100644
--- a/rest_server/operations/terminator/update_terminator_urlbuilder.go
+++ b/rest_server/operations/terminator/update_terminator_urlbuilder.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/operations/ziti_fabric_api.go b/rest_server/operations/ziti_fabric_api.go
index ea04cb1f3..39e77523f 100644
--- a/rest_server/operations/ziti_fabric_api.go
+++ b/rest_server/operations/ziti_fabric_api.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_server/server.go b/rest_server/server.go
index a92a0c9b8..106905620 100644
--- a/rest_server/server.go
+++ b/rest_server/server.go
@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 //
-// Copyright NetFoundry, Inc.
+// Copyright NetFoundry Inc.
 //
 // 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/rest_util/capool.go b/rest_util/capool.go
index 6806cd457..850f3f6a9 100644
--- a/rest_util/capool.go
+++ b/rest_util/capool.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/rest_util/clients.go b/rest_util/clients.go
index 5e78d9cb4..2e0be7a4d 100644
--- a/rest_util/clients.go
+++ b/rest_util/clients.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/rest_util/util.go b/rest_util/util.go
index d0308fcc2..23dc62797 100644
--- a/rest_util/util.go
+++ b/rest_util/util.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/config.go b/router/config.go
index 2809d8ba0..59526bd5e 100644
--- a/router/config.go
+++ b/router/config.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/env/env.go b/router/env/env.go
index 7060bed4e..7e8d84abf 100644
--- a/router/env/env.go
+++ b/router/env/env.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/forwarder/faulter.go b/router/forwarder/faulter.go
index f02ff19ff..149b92c0a 100644
--- a/router/forwarder/faulter.go
+++ b/router/forwarder/faulter.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/forwarder/forwarder.go b/router/forwarder/forwarder.go
index 77b224eeb..b2f8f7bac 100644
--- a/router/forwarder/forwarder.go
+++ b/router/forwarder/forwarder.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/forwarder/options.go b/router/forwarder/options.go
index f45a587a0..2a09ded70 100644
--- a/router/forwarder/options.go
+++ b/router/forwarder/options.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/forwarder/scanner.go b/router/forwarder/scanner.go
index 4b63c181e..9ff403253 100644
--- a/router/forwarder/scanner.go
+++ b/router/forwarder/scanner.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/forwarder/tables.go b/router/forwarder/tables.go
index d9e898223..588b32bcf 100644
--- a/router/forwarder/tables.go
+++ b/router/forwarder/tables.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/handler_ctrl/bind.go b/router/handler_ctrl/bind.go
index f2486aadc..bd5e646fd 100644
--- a/router/handler_ctrl/bind.go
+++ b/router/handler_ctrl/bind.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/handler_ctrl/dial.go b/router/handler_ctrl/dial.go
index dcd3065f5..38d0634f3 100644
--- a/router/handler_ctrl/dial.go
+++ b/router/handler_ctrl/dial.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/handler_ctrl/fault.go b/router/handler_ctrl/fault.go
index b2a684219..938fa040f 100644
--- a/router/handler_ctrl/fault.go
+++ b/router/handler_ctrl/fault.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/handler_ctrl/inspect.go b/router/handler_ctrl/inspect.go
index bd6baefd5..4a5c9acda 100644
--- a/router/handler_ctrl/inspect.go
+++ b/router/handler_ctrl/inspect.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/handler_ctrl/route.go b/router/handler_ctrl/route.go
index 4a22eadc1..69db8f05e 100644
--- a/router/handler_ctrl/route.go
+++ b/router/handler_ctrl/route.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/handler_ctrl/settings.go b/router/handler_ctrl/settings.go
index 8f20ad806..aa0aa4b27 100644
--- a/router/handler_ctrl/settings.go
+++ b/router/handler_ctrl/settings.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/handler_ctrl/toggle_pipe_traces.go b/router/handler_ctrl/toggle_pipe_traces.go
index cb3ab005f..bd4c59a09 100644
--- a/router/handler_ctrl/toggle_pipe_traces.go
+++ b/router/handler_ctrl/toggle_pipe_traces.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/handler_ctrl/unroute.go b/router/handler_ctrl/unroute.go
index 7d37e77e5..6d0bb4306 100644
--- a/router/handler_ctrl/unroute.go
+++ b/router/handler_ctrl/unroute.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/handler_ctrl/validate_terminators.go b/router/handler_ctrl/validate_terminators.go
index 17dfc08a8..d783ad4c6 100644
--- a/router/handler_ctrl/validate_terminators.go
+++ b/router/handler_ctrl/validate_terminators.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/handler_link/ack.go b/router/handler_link/ack.go
index 797d94511..4d3d27aac 100644
--- a/router/handler_link/ack.go
+++ b/router/handler_link/ack.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/handler_link/close.go b/router/handler_link/close.go
index 39053094f..136be1d1a 100644
--- a/router/handler_link/close.go
+++ b/router/handler_link/close.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/handler_link/control.go b/router/handler_link/control.go
index 977172680..b5ec66df4 100644
--- a/router/handler_link/control.go
+++ b/router/handler_link/control.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/handler_link/error.go b/router/handler_link/error.go
index 7bb650a69..dc54520df 100644
--- a/router/handler_link/error.go
+++ b/router/handler_link/error.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/handler_link/payload.go b/router/handler_link/payload.go
index ae3f0f600..a45f18d7c 100644
--- a/router/handler_link/payload.go
+++ b/router/handler_link/payload.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/handler_link/queue_ack.go b/router/handler_link/queue_ack.go
index ed89fcb2d..ba974f1a7 100644
--- a/router/handler_link/queue_ack.go
+++ b/router/handler_link/queue_ack.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/handler_xgress/bind.go b/router/handler_xgress/bind.go
index 14d9b1a1d..0f1cb5347 100644
--- a/router/handler_xgress/bind.go
+++ b/router/handler_xgress/bind.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/handler_xgress/close.go b/router/handler_xgress/close.go
index ffbadf070..e5733d348 100644
--- a/router/handler_xgress/close.go
+++ b/router/handler_xgress/close.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/handler_xgress/receive.go b/router/handler_xgress/receive.go
index 76c8bf5c1..1ea9a185f 100644
--- a/router/handler_xgress/receive.go
+++ b/router/handler_xgress/receive.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/metrics/peekhandler.go b/router/metrics/peekhandler.go
index dc7510a3c..58e2292a2 100644
--- a/router/metrics/peekhandler.go
+++ b/router/metrics/peekhandler.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/monitor.go b/router/monitor.go
index a9e030ff4..b8c827bc2 100644
--- a/router/monitor.go
+++ b/router/monitor.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/monitor_darwin.go b/router/monitor_darwin.go
index eb30ca374..f1346a1ba 100644
--- a/router/monitor_darwin.go
+++ b/router/monitor_darwin.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/monitor_linux.go b/router/monitor_linux.go
index eb30ca374..f1346a1ba 100644
--- a/router/monitor_linux.go
+++ b/router/monitor_linux.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/monitor_windows.go b/router/monitor_windows.go
index 23a562c65..362718f38 100644
--- a/router/monitor_windows.go
+++ b/router/monitor_windows.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/router.go b/router/router.go
index e1f723fb0..d7bc814b1 100644
--- a/router/router.go
+++ b/router/router.go
@@ -1,5 +1,5 @@
 /*
-	(c) Copyright NetFoundry, Inc.
+	(c) Copyright NetFoundry Inc.
 
 	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/router/xgress/ctrl.go b/router/xgress/ctrl.go
index 73ad1205c..fc06c4cf4 100644
--- a/router/xgress/ctrl.go
+++ b/router/xgress/ctrl.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/xgress/decoder.go b/router/xgress/decoder.go
index 8d0b2f20b..7dcdec681 100644
--- a/router/xgress/decoder.go
+++ b/router/xgress/decoder.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/xgress/link_receive_buffer.go b/router/xgress/link_receive_buffer.go
index c2fbc1116..3c10f9660 100644
--- a/router/xgress/link_receive_buffer.go
+++ b/router/xgress/link_receive_buffer.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/xgress/link_send_buffer.go b/router/xgress/link_send_buffer.go
index c23ad9d37..b527399d2 100644
--- a/router/xgress/link_send_buffer.go
+++ b/router/xgress/link_send_buffer.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/xgress/messages.go b/router/xgress/messages.go
index 987377fa3..7f986a97e 100644
--- a/router/xgress/messages.go
+++ b/router/xgress/messages.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/xgress/messages_test.go b/router/xgress/messages_test.go
index 9d54f99e1..ef350bb63 100644
--- a/router/xgress/messages_test.go
+++ b/router/xgress/messages_test.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/xgress/options.go b/router/xgress/options.go
index 6464ff671..4263a9246 100644
--- a/router/xgress/options.go
+++ b/router/xgress/options.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/xgress/readuntil.go b/router/xgress/readuntil.go
index 8689ddef7..01224db59 100644
--- a/router/xgress/readuntil.go
+++ b/router/xgress/readuntil.go
@@ -1,5 +1,5 @@
 /*
-	Copyright 2019 NetFoundry, Inc.
+	Copyright 2019 NetFoundry Inc.
 
 	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/router/xgress/registry.go b/router/xgress/registry.go
index fea60a6ee..c7e8d2580 100644
--- a/router/xgress/registry.go
+++ b/router/xgress/registry.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/xgress/request.go b/router/xgress/request.go
index eb39676b3..2059bc88b 100644
--- a/router/xgress/request.go
+++ b/router/xgress/request.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/xgress/xgress.go b/router/xgress/xgress.go
index 3dea1ef10..9e885f05d 100644
--- a/router/xgress/xgress.go
+++ b/router/xgress/xgress.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/xgress_proxy/connection.go b/router/xgress_proxy/connection.go
index d2bf309b9..5f9defc35 100644
--- a/router/xgress_proxy/connection.go
+++ b/router/xgress_proxy/connection.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/xgress_proxy/factory.go b/router/xgress_proxy/factory.go
index 56e669573..24031be2f 100644
--- a/router/xgress_proxy/factory.go
+++ b/router/xgress_proxy/factory.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/xgress_proxy/listener.go b/router/xgress_proxy/listener.go
index 926e5ac86..812db39c8 100644
--- a/router/xgress_proxy/listener.go
+++ b/router/xgress_proxy/listener.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/xgress_proxy_udp/factory.go b/router/xgress_proxy_udp/factory.go
index 423839f0e..107338840 100644
--- a/router/xgress_proxy_udp/factory.go
+++ b/router/xgress_proxy_udp/factory.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/xgress_proxy_udp/listener.go b/router/xgress_proxy_udp/listener.go
index 034ed254c..d757cf301 100644
--- a/router/xgress_proxy_udp/listener.go
+++ b/router/xgress_proxy_udp/listener.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/xgress_transport/client.go b/router/xgress_transport/client.go
index c5fea6916..76cb8b969 100644
--- a/router/xgress_transport/client.go
+++ b/router/xgress_transport/client.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/xgress_transport/connection.go b/router/xgress_transport/connection.go
index 0cd844e3c..308d93569 100644
--- a/router/xgress_transport/connection.go
+++ b/router/xgress_transport/connection.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/xgress_transport/dialer.go b/router/xgress_transport/dialer.go
index 6d2eb9ee3..823bcea01 100644
--- a/router/xgress_transport/dialer.go
+++ b/router/xgress_transport/dialer.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/xgress_transport/factory.go b/router/xgress_transport/factory.go
index 4066530a4..7f1f4678a 100644
--- a/router/xgress_transport/factory.go
+++ b/router/xgress_transport/factory.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/xgress_transport/listener.go b/router/xgress_transport/listener.go
index fe88c88c2..d6cb52cde 100644
--- a/router/xgress_transport/listener.go
+++ b/router/xgress_transport/listener.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/xgress_transport_udp/connection.go b/router/xgress_transport_udp/connection.go
index a14b83836..8404d30d2 100644
--- a/router/xgress_transport_udp/connection.go
+++ b/router/xgress_transport_udp/connection.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/xgress_transport_udp/dialer.go b/router/xgress_transport_udp/dialer.go
index 1e1f7fb1d..a43d726a8 100644
--- a/router/xgress_transport_udp/dialer.go
+++ b/router/xgress_transport_udp/dialer.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/xgress_transport_udp/factory.go b/router/xgress_transport_udp/factory.go
index 74b846e2e..e9930da2c 100644
--- a/router/xgress_transport_udp/factory.go
+++ b/router/xgress_transport_udp/factory.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/xgress_transport_udp/listener.go b/router/xgress_transport_udp/listener.go
index 62044c385..3365899f8 100644
--- a/router/xgress_transport_udp/listener.go
+++ b/router/xgress_transport_udp/listener.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/xgress_udp/address.go b/router/xgress_udp/address.go
index 61c8665c9..beaaf759b 100644
--- a/router/xgress_udp/address.go
+++ b/router/xgress_udp/address.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/xgress_udp/data.go b/router/xgress_udp/data.go
index aac0b2e28..dc92f0181 100644
--- a/router/xgress_udp/data.go
+++ b/router/xgress_udp/data.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/xgress_udp/listener.go b/router/xgress_udp/listener.go
index 4d7a48f26..9173cf169 100644
--- a/router/xgress_udp/listener.go
+++ b/router/xgress_udp/listener.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/xgress_udp/session.go b/router/xgress_udp/session.go
index 134b180c7..d97d4c297 100644
--- a/router/xgress_udp/session.go
+++ b/router/xgress_udp/session.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/router/xlink/xlink.go b/router/xlink/xlink.go
index f2a965fc0..6df675adf 100644
--- a/router/xlink/xlink.go
+++ b/router/xlink/xlink.go
@@ -1,5 +1,5 @@
 /*
-	(c) Copyright NetFoundry, Inc.
+	(c) Copyright NetFoundry Inc.
 
 	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/router/xlink_transport/bind.go b/router/xlink_transport/bind.go
index 3a6a7f14e..50961505b 100644
--- a/router/xlink_transport/bind.go
+++ b/router/xlink_transport/bind.go
@@ -1,5 +1,5 @@
 /*
-	(c) Copyright NetFoundry, Inc.
+	(c) Copyright NetFoundry Inc.
 
 	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/router/xlink_transport/config.go b/router/xlink_transport/config.go
index b6115b3b2..75075aa9e 100644
--- a/router/xlink_transport/config.go
+++ b/router/xlink_transport/config.go
@@ -1,5 +1,5 @@
 /*
-	(c) Copyright NetFoundry, Inc.
+	(c) Copyright NetFoundry Inc.
 
 	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/router/xlink_transport/connect.go b/router/xlink_transport/connect.go
index 4edfff281..0ef862ffb 100644
--- a/router/xlink_transport/connect.go
+++ b/router/xlink_transport/connect.go
@@ -1,5 +1,5 @@
 /*
-	(c) Copyright NetFoundry, Inc.
+	(c) Copyright NetFoundry Inc.
 
 	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/router/xlink_transport/dialer.go b/router/xlink_transport/dialer.go
index f808e361d..f913d5b43 100644
--- a/router/xlink_transport/dialer.go
+++ b/router/xlink_transport/dialer.go
@@ -1,5 +1,5 @@
 /*
-	(c) Copyright NetFoundry, Inc.
+	(c) Copyright NetFoundry Inc.
 
 	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/router/xlink_transport/factory.go b/router/xlink_transport/factory.go
index 865bd17c2..7d5b215b4 100644
--- a/router/xlink_transport/factory.go
+++ b/router/xlink_transport/factory.go
@@ -1,5 +1,5 @@
 /*
-	(c) Copyright NetFoundry, Inc.
+	(c) Copyright NetFoundry Inc.
 
 	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/router/xlink_transport/listener.go b/router/xlink_transport/listener.go
index c13a6af54..699b979d2 100644
--- a/router/xlink_transport/listener.go
+++ b/router/xlink_transport/listener.go
@@ -1,5 +1,5 @@
 /*
-	(c) Copyright NetFoundry, Inc.
+	(c) Copyright NetFoundry Inc.
 
 	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/router/xlink_transport/xlink.go b/router/xlink_transport/xlink.go
index 32f6697bc..186aefa48 100644
--- a/router/xlink_transport/xlink.go
+++ b/router/xlink_transport/xlink.go
@@ -1,5 +1,5 @@
 /*
-	(c) Copyright NetFoundry, Inc.
+	(c) Copyright NetFoundry Inc.
 
 	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/router/xlink_transport/xlink_split.go b/router/xlink_transport/xlink_split.go
index a6337b627..01123e209 100644
--- a/router/xlink_transport/xlink_split.go
+++ b/router/xlink_transport/xlink_split.go
@@ -1,5 +1,5 @@
 /*
-	(c) Copyright NetFoundry, Inc.
+	(c) Copyright NetFoundry Inc.
 
 	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/tests/context.go b/tests/context.go
index 7265bf87d..42330c183 100644
--- a/tests/context.go
+++ b/tests/context.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/trace/channel_peekhandler.go b/trace/channel_peekhandler.go
index b5f034c84..6b7a4ba02 100644
--- a/trace/channel_peekhandler.go
+++ b/trace/channel_peekhandler.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/trace/controller.go b/trace/controller.go
index a7b746e97..d9955e2c3 100644
--- a/trace/controller.go
+++ b/trace/controller.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/trace/event_handler.go b/trace/event_handler.go
index 52b6ff95c..5ffaa435d 100644
--- a/trace/event_handler.go
+++ b/trace/event_handler.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/trace/filter.go b/trace/filter.go
index 5377a5620..37d7e0dc5 100644
--- a/trace/filter.go
+++ b/trace/filter.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	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/trace/xgress_peekhandler.go b/trace/xgress_peekhandler.go
index aa85ecf5c..a9b4aad44 100644
--- a/trace/xgress_peekhandler.go
+++ b/trace/xgress_peekhandler.go
@@ -1,5 +1,5 @@
 /*
-	Copyright NetFoundry, Inc.
+	Copyright NetFoundry Inc.
 
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.