diff --git a/common/version/info.go b/common/version/info.go
index ef30dde83..2e7fb544d 100644
--- a/common/version/info.go
+++ b/common/version/info.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/test/data-maker/data-maker.go b/test/data-maker/data-maker.go
index 13bfe8854..f680a5f0b 100644
--- a/test/data-maker/data-maker.go
+++ b/test/data-maker/data-maker.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/test/id_test_utils.go b/test/id_test_utils.go
index c0f51f79f..3a85e79f6 100644
--- a/test/id_test_utils.go
+++ b/test/id_test_utils.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/test/multi-conn-test/multi-conn-test.go b/test/multi-conn-test/multi-conn-test.go
index ab860eea8..39e097713 100644
--- a/test/multi-conn-test/multi-conn-test.go
+++ b/test/multi-conn-test/multi-conn-test.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/test/sdk-echo-server/sdk-echo-server.go b/test/sdk-echo-server/sdk-echo-server.go
index a980d0e03..381f9fe45 100644
--- a/test/sdk-echo-server/sdk-echo-server.go
+++ b/test/sdk-echo-server/sdk-echo-server.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/test/zapp-fortio-grpc-server/ping.pb.go b/test/zapp-fortio-grpc-server/ping.pb.go
index 4d1a9faf9..92e2bece8 100644
--- a/test/zapp-fortio-grpc-server/ping.pb.go
+++ b/test/zapp-fortio-grpc-server/ping.pb.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/test/zapp-fortio-grpc-server/zapp-fortio-grpc-server.go b/test/zapp-fortio-grpc-server/zapp-fortio-grpc-server.go
index 1ba456ce8..0e9322adf 100644
--- a/test/zapp-fortio-grpc-server/zapp-fortio-grpc-server.go
+++ b/test/zapp-fortio-grpc-server/zapp-fortio-grpc-server.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/ziti-controller/main.go b/ziti-controller/main.go
index e573d3691..2c38c9af8 100644
--- a/ziti-controller/main.go
+++ b/ziti-controller/main.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/ziti-controller/subcmd/root.go b/ziti-controller/subcmd/root.go
index bae06d3ae..25762df02 100644
--- a/ziti-controller/subcmd/root.go
+++ b/ziti-controller/subcmd/root.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/ziti-controller/subcmd/run.go b/ziti-controller/subcmd/run.go
index ec4534394..80a8d71de 100644
--- a/ziti-controller/subcmd/run.go
+++ b/ziti-controller/subcmd/run.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/ziti-controller/subcmd/version.go b/ziti-controller/subcmd/version.go
index 8d6e5b883..0ecec709d 100644
--- a/ziti-controller/subcmd/version.go
+++ b/ziti-controller/subcmd/version.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/ziti-enroller/main.go b/ziti-enroller/main.go
index 1046a6193..7b7dbb9d6 100644
--- a/ziti-enroller/main.go
+++ b/ziti-enroller/main.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/ziti-enroller/subcmd/root.go b/ziti-enroller/subcmd/root.go
index d0b584dce..f69bcde04 100644
--- a/ziti-enroller/subcmd/root.go
+++ b/ziti-enroller/subcmd/root.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/ziti-enroller/subcmd/version.go b/ziti-enroller/subcmd/version.go
index fb4b517f9..04c01c7c2 100644
--- a/ziti-enroller/subcmd/version.go
+++ b/ziti-enroller/subcmd/version.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/ziti-fabric-gw/main.go b/ziti-fabric-gw/main.go
index 80c37a8be..cdff24182 100644
--- a/ziti-fabric-gw/main.go
+++ b/ziti-fabric-gw/main.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/ziti-fabric-gw/subcmd/config.go b/ziti-fabric-gw/subcmd/config.go
index b2442106b..64387519a 100644
--- a/ziti-fabric-gw/subcmd/config.go
+++ b/ziti-fabric-gw/subcmd/config.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/ziti-fabric-gw/subcmd/create_service.go b/ziti-fabric-gw/subcmd/create_service.go
index a5f522100..1e2e020ab 100644
--- a/ziti-fabric-gw/subcmd/create_service.go
+++ b/ziti-fabric-gw/subcmd/create_service.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/ziti-fabric-gw/subcmd/get_service.go b/ziti-fabric-gw/subcmd/get_service.go
index 536e3c5ad..fe0c15984 100644
--- a/ziti-fabric-gw/subcmd/get_service.go
+++ b/ziti-fabric-gw/subcmd/get_service.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/ziti-fabric-gw/subcmd/list_links.go b/ziti-fabric-gw/subcmd/list_links.go
index ea920798c..341d541b5 100644
--- a/ziti-fabric-gw/subcmd/list_links.go
+++ b/ziti-fabric-gw/subcmd/list_links.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/ziti-fabric-gw/subcmd/list_routers.go b/ziti-fabric-gw/subcmd/list_routers.go
index f4eb14bff..a916c950b 100644
--- a/ziti-fabric-gw/subcmd/list_routers.go
+++ b/ziti-fabric-gw/subcmd/list_routers.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/ziti-fabric-gw/subcmd/list_services.go b/ziti-fabric-gw/subcmd/list_services.go
index c0c70eb63..770cd3583 100644
--- a/ziti-fabric-gw/subcmd/list_services.go
+++ b/ziti-fabric-gw/subcmd/list_services.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/ziti-fabric-gw/subcmd/list_sessions.go b/ziti-fabric-gw/subcmd/list_sessions.go
index 004759d6b..f86759d4f 100644
--- a/ziti-fabric-gw/subcmd/list_sessions.go
+++ b/ziti-fabric-gw/subcmd/list_sessions.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/ziti-fabric-gw/subcmd/messages.go b/ziti-fabric-gw/subcmd/messages.go
index d17a5e9dd..784ce0f5c 100644
--- a/ziti-fabric-gw/subcmd/messages.go
+++ b/ziti-fabric-gw/subcmd/messages.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/ziti-fabric-gw/subcmd/remove_service.go b/ziti-fabric-gw/subcmd/remove_service.go
index 85a498160..e71e9c1e3 100644
--- a/ziti-fabric-gw/subcmd/remove_service.go
+++ b/ziti-fabric-gw/subcmd/remove_service.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/ziti-fabric-gw/subcmd/root.go b/ziti-fabric-gw/subcmd/root.go
index 849754f15..2cdfb49c8 100644
--- a/ziti-fabric-gw/subcmd/root.go
+++ b/ziti-fabric-gw/subcmd/root.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/ziti-fabric-gw/subcmd/run.go b/ziti-fabric-gw/subcmd/run.go
index 37c8aaa5d..d9a23e112 100644
--- a/ziti-fabric-gw/subcmd/run.go
+++ b/ziti-fabric-gw/subcmd/run.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/ziti-fabric-gw/subcmd/version.go b/ziti-fabric-gw/subcmd/version.go
index 8d6e5b883..0ecec709d 100644
--- a/ziti-fabric-gw/subcmd/version.go
+++ b/ziti-fabric-gw/subcmd/version.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/ziti-fabric-test/main.go b/ziti-fabric-test/main.go
index 30137a329..67520ea35 100644
--- a/ziti-fabric-test/main.go
+++ b/ziti-fabric-test/main.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/ziti-fabric-test/subcmd/client/http.go b/ziti-fabric-test/subcmd/client/http.go
index 2caee6f3b..713e4be66 100644
--- a/ziti-fabric-test/subcmd/client/http.go
+++ b/ziti-fabric-test/subcmd/client/http.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/ziti-fabric-test/subcmd/client/nc.go b/ziti-fabric-test/subcmd/client/nc.go
index fc67c4c3c..e47ae8273 100644
--- a/ziti-fabric-test/subcmd/client/nc.go
+++ b/ziti-fabric-test/subcmd/client/nc.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/ziti-fabric-test/subcmd/loop2/dialer.go b/ziti-fabric-test/subcmd/loop2/dialer.go
index 34a25596f..16d64212f 100644
--- a/ziti-fabric-test/subcmd/loop2/dialer.go
+++ b/ziti-fabric-test/subcmd/loop2/dialer.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/ziti-fabric-test/subcmd/loop2/generator.go b/ziti-fabric-test/subcmd/loop2/generator.go
index 4ec7f4cea..5cd35739a 100644
--- a/ziti-fabric-test/subcmd/loop2/generator.go
+++ b/ziti-fabric-test/subcmd/loop2/generator.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/ziti-fabric-test/subcmd/loop2/listener.go b/ziti-fabric-test/subcmd/loop2/listener.go
index 80d0da785..414a6b5f8 100644
--- a/ziti-fabric-test/subcmd/loop2/listener.go
+++ b/ziti-fabric-test/subcmd/loop2/listener.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/ziti-fabric-test/subcmd/loop2/loop2.go b/ziti-fabric-test/subcmd/loop2/loop2.go
index 08872c1e6..8f2bfe1da 100644
--- a/ziti-fabric-test/subcmd/loop2/loop2.go
+++ b/ziti-fabric-test/subcmd/loop2/loop2.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/ziti-fabric-test/subcmd/loop2/pb/loop.pb.go b/ziti-fabric-test/subcmd/loop2/pb/loop.pb.go
index a312d44d0..c9f737288 100644
--- a/ziti-fabric-test/subcmd/loop2/pb/loop.pb.go
+++ b/ziti-fabric-test/subcmd/loop2/pb/loop.pb.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/ziti-fabric-test/subcmd/loop2/protocol.go b/ziti-fabric-test/subcmd/loop2/protocol.go
index 171626574..afa032b62 100644
--- a/ziti-fabric-test/subcmd/loop2/protocol.go
+++ b/ziti-fabric-test/subcmd/loop2/protocol.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/ziti-fabric-test/subcmd/loop2/scenario.go b/ziti-fabric-test/subcmd/loop2/scenario.go
index a3d1f4d0e..990461b8a 100644
--- a/ziti-fabric-test/subcmd/loop2/scenario.go
+++ b/ziti-fabric-test/subcmd/loop2/scenario.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/ziti-fabric-test/subcmd/loop3/dialer.go b/ziti-fabric-test/subcmd/loop3/dialer.go
index 7b39ff67b..1817f11f8 100644
--- a/ziti-fabric-test/subcmd/loop3/dialer.go
+++ b/ziti-fabric-test/subcmd/loop3/dialer.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/ziti-fabric-test/subcmd/loop3/generator.go b/ziti-fabric-test/subcmd/loop3/generator.go
index 95958deaf..ff77ed4c5 100644
--- a/ziti-fabric-test/subcmd/loop3/generator.go
+++ b/ziti-fabric-test/subcmd/loop3/generator.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/ziti-fabric-test/subcmd/loop3/listener.go b/ziti-fabric-test/subcmd/loop3/listener.go
index b15e9a040..9bd31461b 100644
--- a/ziti-fabric-test/subcmd/loop3/listener.go
+++ b/ziti-fabric-test/subcmd/loop3/listener.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/ziti-fabric-test/subcmd/loop3/loop3.go b/ziti-fabric-test/subcmd/loop3/loop3.go
index f774c54c8..924dfbb20 100644
--- a/ziti-fabric-test/subcmd/loop3/loop3.go
+++ b/ziti-fabric-test/subcmd/loop3/loop3.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/ziti-fabric-test/subcmd/loop3/pb/loop.pb.go b/ziti-fabric-test/subcmd/loop3/pb/loop.pb.go
index a10ef7f1b..3c7eed59d 100644
--- a/ziti-fabric-test/subcmd/loop3/pb/loop.pb.go
+++ b/ziti-fabric-test/subcmd/loop3/pb/loop.pb.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/ziti-fabric-test/subcmd/loop3/protocol.go b/ziti-fabric-test/subcmd/loop3/protocol.go
index 5d225b2a7..d038c9081 100644
--- a/ziti-fabric-test/subcmd/loop3/protocol.go
+++ b/ziti-fabric-test/subcmd/loop3/protocol.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/ziti-fabric-test/subcmd/loop3/scenario.go b/ziti-fabric-test/subcmd/loop3/scenario.go
index e1d49b22c..62b4afbae 100644
--- a/ziti-fabric-test/subcmd/loop3/scenario.go
+++ b/ziti-fabric-test/subcmd/loop3/scenario.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/ziti-fabric-test/subcmd/root.go b/ziti-fabric-test/subcmd/root.go
index c2720cde8..7ea63b3d2 100644
--- a/ziti-fabric-test/subcmd/root.go
+++ b/ziti-fabric-test/subcmd/root.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/ziti-fabric-test/subcmd/version.go b/ziti-fabric-test/subcmd/version.go
index d21b5e0b0..8dba1be6b 100644
--- a/ziti-fabric-test/subcmd/version.go
+++ b/ziti-fabric-test/subcmd/version.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/ziti-fabric/main.go b/ziti-fabric/main.go
index e32e7a745..825f9d19a 100644
--- a/ziti-fabric/main.go
+++ b/ziti-fabric/main.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/ziti-fabric/subcmd/client.go b/ziti-fabric/subcmd/client.go
index 6d0d474d7..d2579a955 100644
--- a/ziti-fabric/subcmd/client.go
+++ b/ziti-fabric/subcmd/client.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/ziti-fabric/subcmd/create_router.go b/ziti-fabric/subcmd/create_router.go
index b0bb6160f..03971ac1c 100644
--- a/ziti-fabric/subcmd/create_router.go
+++ b/ziti-fabric/subcmd/create_router.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/ziti-fabric/subcmd/create_service.go b/ziti-fabric/subcmd/create_service.go
index 8416afdd6..96e8187ca 100644
--- a/ziti-fabric/subcmd/create_service.go
+++ b/ziti-fabric/subcmd/create_service.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/ziti-fabric/subcmd/get_service.go b/ziti-fabric/subcmd/get_service.go
index 5a5774583..75f8f16f5 100644
--- a/ziti-fabric/subcmd/get_service.go
+++ b/ziti-fabric/subcmd/get_service.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/ziti-fabric/subcmd/inspect.go b/ziti-fabric/subcmd/inspect.go
index da0471f27..eb607d6b6 100644
--- a/ziti-fabric/subcmd/inspect.go
+++ b/ziti-fabric/subcmd/inspect.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/ziti-fabric/subcmd/list_links.go b/ziti-fabric/subcmd/list_links.go
index d18f1f663..0582e47bf 100644
--- a/ziti-fabric/subcmd/list_links.go
+++ b/ziti-fabric/subcmd/list_links.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/ziti-fabric/subcmd/list_routers.go b/ziti-fabric/subcmd/list_routers.go
index f155d89d1..fac410637 100644
--- a/ziti-fabric/subcmd/list_routers.go
+++ b/ziti-fabric/subcmd/list_routers.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/ziti-fabric/subcmd/list_services.go b/ziti-fabric/subcmd/list_services.go
index 6a777e060..cdebf64cd 100644
--- a/ziti-fabric/subcmd/list_services.go
+++ b/ziti-fabric/subcmd/list_services.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/ziti-fabric/subcmd/list_sessions.go b/ziti-fabric/subcmd/list_sessions.go
index 4f6f49694..05658f198 100644
--- a/ziti-fabric/subcmd/list_sessions.go
+++ b/ziti-fabric/subcmd/list_sessions.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/ziti-fabric/subcmd/remove_router.go b/ziti-fabric/subcmd/remove_router.go
index 913d15872..42e44baae 100644
--- a/ziti-fabric/subcmd/remove_router.go
+++ b/ziti-fabric/subcmd/remove_router.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/ziti-fabric/subcmd/remove_service.go b/ziti-fabric/subcmd/remove_service.go
index e594c9747..747526834 100644
--- a/ziti-fabric/subcmd/remove_service.go
+++ b/ziti-fabric/subcmd/remove_service.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/ziti-fabric/subcmd/remove_session.go b/ziti-fabric/subcmd/remove_session.go
index 6cc13166b..58eb6b8de 100644
--- a/ziti-fabric/subcmd/remove_session.go
+++ b/ziti-fabric/subcmd/remove_session.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/ziti-fabric/subcmd/root.go b/ziti-fabric/subcmd/root.go
index 943a2ddfb..22eba34b4 100644
--- a/ziti-fabric/subcmd/root.go
+++ b/ziti-fabric/subcmd/root.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/ziti-fabric/subcmd/set_link_cost.go b/ziti-fabric/subcmd/set_link_cost.go
index aba94e836..faa49bb2a 100644
--- a/ziti-fabric/subcmd/set_link_cost.go
+++ b/ziti-fabric/subcmd/set_link_cost.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/ziti-fabric/subcmd/set_link_down.go b/ziti-fabric/subcmd/set_link_down.go
index 1d2491c00..15ff0c3a8 100644
--- a/ziti-fabric/subcmd/set_link_down.go
+++ b/ziti-fabric/subcmd/set_link_down.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/ziti-fabric/subcmd/stream_helpers.go b/ziti-fabric/subcmd/stream_helpers.go
index ecc0061c9..50eee6919 100644
--- a/ziti-fabric/subcmd/stream_helpers.go
+++ b/ziti-fabric/subcmd/stream_helpers.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/ziti-fabric/subcmd/stream_metrics.go b/ziti-fabric/subcmd/stream_metrics.go
index 2b43b4a6a..f2b314ad2 100644
--- a/ziti-fabric/subcmd/stream_metrics.go
+++ b/ziti-fabric/subcmd/stream_metrics.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/ziti-fabric/subcmd/stream_sessions.go b/ziti-fabric/subcmd/stream_sessions.go
index d79e2c1c9..b5da79269 100644
--- a/ziti-fabric/subcmd/stream_sessions.go
+++ b/ziti-fabric/subcmd/stream_sessions.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/ziti-fabric/subcmd/stream_toggle_pipe_traces.go b/ziti-fabric/subcmd/stream_toggle_pipe_traces.go
index f087535f8..7bbf0d1d9 100644
--- a/ziti-fabric/subcmd/stream_toggle_pipe_traces.go
+++ b/ziti-fabric/subcmd/stream_toggle_pipe_traces.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/ziti-fabric/subcmd/stream_traces.go b/ziti-fabric/subcmd/stream_traces.go
index 3f26bd0e0..1f7daa738 100644
--- a/ziti-fabric/subcmd/stream_traces.go
+++ b/ziti-fabric/subcmd/stream_traces.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/ziti-fabric/subcmd/trace/dump.go b/ziti-fabric/subcmd/trace/dump.go
index 9ba071c10..be372f9f5 100644
--- a/ziti-fabric/subcmd/trace/dump.go
+++ b/ziti-fabric/subcmd/trace/dump.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/ziti-fabric/subcmd/trace/merge.go b/ziti-fabric/subcmd/trace/merge.go
index e966a8e78..4ebb0f753 100644
--- a/ziti-fabric/subcmd/trace/merge.go
+++ b/ziti-fabric/subcmd/trace/merge.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/ziti-fabric/subcmd/trace/trace.go b/ziti-fabric/subcmd/trace/trace.go
index 844d74582..b48fa6c5f 100644
--- a/ziti-fabric/subcmd/trace/trace.go
+++ b/ziti-fabric/subcmd/trace/trace.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/ziti-fabric/subcmd/version.go b/ziti-fabric/subcmd/version.go
index 7562e0d12..d084854e5 100644
--- a/ziti-fabric/subcmd/version.go
+++ b/ziti-fabric/subcmd/version.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/ziti-router/main.go b/ziti-router/main.go
index 95b1ab9ec..ddc7824b9 100644
--- a/ziti-router/main.go
+++ b/ziti-router/main.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/ziti-router/subcmd/enrollgw.go b/ziti-router/subcmd/enrollgw.go
index 20ce4b1d8..f2e6a1144 100644
--- a/ziti-router/subcmd/enrollgw.go
+++ b/ziti-router/subcmd/enrollgw.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/ziti-router/subcmd/root.go b/ziti-router/subcmd/root.go
index 14e09955e..e45eb9c58 100644
--- a/ziti-router/subcmd/root.go
+++ b/ziti-router/subcmd/root.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/ziti-router/subcmd/run.go b/ziti-router/subcmd/run.go
index c45059ec8..5dfef8d28 100644
--- a/ziti-router/subcmd/run.go
+++ b/ziti-router/subcmd/run.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/ziti-router/subcmd/version.go b/ziti-router/subcmd/version.go
index 8d6e5b883..0ecec709d 100644
--- a/ziti-router/subcmd/version.go
+++ b/ziti-router/subcmd/version.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/ziti-tunnel/cmd/ziti-tunnel/main.go b/ziti-tunnel/cmd/ziti-tunnel/main.go
index 108569eb1..9a4a0a1dc 100644
--- a/ziti-tunnel/cmd/ziti-tunnel/main.go
+++ b/ziti-tunnel/cmd/ziti-tunnel/main.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/ziti-tunnel/cmd/ziti-tunnel/subcmd/proxy.go b/ziti-tunnel/cmd/ziti-tunnel/subcmd/proxy.go
index cbf665a02..51297df7e 100644
--- a/ziti-tunnel/cmd/ziti-tunnel/subcmd/proxy.go
+++ b/ziti-tunnel/cmd/ziti-tunnel/subcmd/proxy.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/ziti-tunnel/cmd/ziti-tunnel/subcmd/root.go b/ziti-tunnel/cmd/ziti-tunnel/subcmd/root.go
index 5c317cbe7..943ba15bd 100644
--- a/ziti-tunnel/cmd/ziti-tunnel/subcmd/root.go
+++ b/ziti-tunnel/cmd/ziti-tunnel/subcmd/root.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/ziti-tunnel/cmd/ziti-tunnel/subcmd/run.go b/ziti-tunnel/cmd/ziti-tunnel/subcmd/run.go
index 026ce7734..334b27e86 100644
--- a/ziti-tunnel/cmd/ziti-tunnel/subcmd/run.go
+++ b/ziti-tunnel/cmd/ziti-tunnel/subcmd/run.go
@@ -1,7 +1,7 @@
 // +build linux
 
 /*
-	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/ziti-tunnel/cmd/ziti-tunnel/subcmd/tproxy.go b/ziti-tunnel/cmd/ziti-tunnel/subcmd/tproxy.go
index 3616cbe02..3475443ad 100644
--- a/ziti-tunnel/cmd/ziti-tunnel/subcmd/tproxy.go
+++ b/ziti-tunnel/cmd/ziti-tunnel/subcmd/tproxy.go
@@ -1,7 +1,7 @@
 // +build linux
 
 /*
-	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/ziti-tunnel/cmd/ziti-tunnel/subcmd/tun.go b/ziti-tunnel/cmd/ziti-tunnel/subcmd/tun.go
index 7db66d7d1..6b97ec440 100644
--- a/ziti-tunnel/cmd/ziti-tunnel/subcmd/tun.go
+++ b/ziti-tunnel/cmd/ziti-tunnel/subcmd/tun.go
@@ -1,7 +1,7 @@
 // +build linux
 
 /*
-	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/ziti-tunnel/cmd/ziti-tunnel/subcmd/version.go b/ziti-tunnel/cmd/ziti-tunnel/subcmd/version.go
index 20c3d4e1c..1cd9c8d05 100644
--- a/ziti-tunnel/cmd/ziti-tunnel/subcmd/version.go
+++ b/ziti-tunnel/cmd/ziti-tunnel/subcmd/version.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/ziti/agent/agent.go b/ziti/agent/agent.go
index 84eed5497..dae30557b 100644
--- a/ziti/agent/agent.go
+++ b/ziti/agent/agent.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/ziti/agent/agent_test.go b/ziti/agent/agent_test.go
index f7753c47a..0491192ee 100644
--- a/ziti/agent/agent_test.go
+++ b/ziti/agent/agent_test.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/ziti/ansible/install.go b/ziti/ansible/install.go
index 7403274d5..33ce4bb2d 100644
--- a/ziti/ansible/install.go
+++ b/ziti/ansible/install.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/ziti/ansible/main.go b/ziti/ansible/main.go
index 99bf02232..85364cd77 100644
--- a/ziti/ansible/main.go
+++ b/ziti/ansible/main.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/ziti/ansible/module.go b/ziti/ansible/module.go
index 035ad0548..c9d164a07 100644
--- a/ziti/ansible/module.go
+++ b/ziti/ansible/module.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/ziti/ansible/playbook.go b/ziti/ansible/playbook.go
index 0fc6ba841..6ba7f8770 100644
--- a/ziti/ansible/playbook.go
+++ b/ziti/ansible/playbook.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/ziti/cmd/factory/factory.go b/ziti/cmd/factory/factory.go
index d90b2521d..8afebb95e 100644
--- a/ziti/cmd/factory/factory.go
+++ b/ziti/cmd/factory/factory.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/ziti/cmd/ziti/cmd/adhoc.go b/ziti/cmd/ziti/cmd/adhoc.go
index d0cc72ab1..eabc3e44c 100644
--- a/ziti/cmd/ziti/cmd/adhoc.go
+++ b/ziti/cmd/ziti/cmd/adhoc.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/ziti/cmd/ziti/cmd/art.go b/ziti/cmd/ziti/cmd/art.go
index 7cc9f35a3..aa94e7864 100644
--- a/ziti/cmd/ziti/cmd/art.go
+++ b/ziti/cmd/ziti/cmd/art.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/ziti/cmd/ziti/cmd/cmd.go b/ziti/cmd/ziti/cmd/cmd.go
index 6bfbef246..289d99a2c 100644
--- a/ziti/cmd/ziti/cmd/cmd.go
+++ b/ziti/cmd/ziti/cmd/cmd.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/ziti/cmd/ziti/cmd/color/color.go b/ziti/cmd/ziti/cmd/color/color.go
index 9131da19b..e48b99ef3 100644
--- a/ziti/cmd/ziti/cmd/color/color.go
+++ b/ziti/cmd/ziti/cmd/color/color.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/ziti/cmd/ziti/cmd/common.go b/ziti/cmd/ziti/cmd/common.go
index 8f28c4acb..2d04164f0 100644
--- a/ziti/cmd/ziti/cmd/common.go
+++ b/ziti/cmd/ziti/cmd/common.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/ziti/cmd/ziti/cmd/common/options.go b/ziti/cmd/ziti/cmd/common/options.go
index 5d90c45f4..19677152c 100644
--- a/ziti/cmd/ziti/cmd/common/options.go
+++ b/ziti/cmd/ziti/cmd/common/options.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/ziti/cmd/ziti/cmd/common_commands.go b/ziti/cmd/ziti/cmd/common_commands.go
index ba8f8f4e7..db896fb47 100644
--- a/ziti/cmd/ziti/cmd/common_commands.go
+++ b/ziti/cmd/ziti/cmd/common_commands.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/ziti/cmd/ziti/cmd/common_init.go b/ziti/cmd/ziti/cmd/common_init.go
index ade1cc585..0c9c9f465 100644
--- a/ziti/cmd/ziti/cmd/common_init.go
+++ b/ziti/cmd/ziti/cmd/common_init.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/ziti/cmd/ziti/cmd/common_install.go b/ziti/cmd/ziti/cmd/common_install.go
index 4044c9634..4b6a3d923 100644
--- a/ziti/cmd/ziti/cmd/common_install.go
+++ b/ziti/cmd/ziti/cmd/common_install.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/ziti/cmd/ziti/cmd/common_install_test.go b/ziti/cmd/ziti/cmd/common_install_test.go
index 426ff40c1..634f60cb2 100644
--- a/ziti/cmd/ziti/cmd/common_install_test.go
+++ b/ziti/cmd/ziti/cmd/common_install_test.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/ziti/cmd/ziti/cmd/create.go b/ziti/cmd/ziti/cmd/create.go
index 6e4518ea9..776121790 100644
--- a/ziti/cmd/ziti/cmd/create.go
+++ b/ziti/cmd/ziti/cmd/create.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/ziti/cmd/ziti/cmd/create_config.go b/ziti/cmd/ziti/cmd/create_config.go
index 535cf5cfa..789072163 100644
--- a/ziti/cmd/ziti/cmd/create_config.go
+++ b/ziti/cmd/ziti/cmd/create_config.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/ziti/cmd/ziti/cmd/create_config_controller.go b/ziti/cmd/ziti/cmd/create_config_controller.go
index 61af7b789..072e33c09 100644
--- a/ziti/cmd/ziti/cmd/create_config_controller.go
+++ b/ziti/cmd/ziti/cmd/create_config_controller.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/ziti/cmd/ziti/cmd/create_config_gw.go b/ziti/cmd/ziti/cmd/create_config_gw.go
index c9f667660..397d9c9ba 100644
--- a/ziti/cmd/ziti/cmd/create_config_gw.go
+++ b/ziti/cmd/ziti/cmd/create_config_gw.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/ziti/cmd/ziti/cmd/create_config_mgmt.go b/ziti/cmd/ziti/cmd/create_config_mgmt.go
index c75e6c2ad..c07bfc381 100644
--- a/ziti/cmd/ziti/cmd/create_config_mgmt.go
+++ b/ziti/cmd/ziti/cmd/create_config_mgmt.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/ziti/cmd/ziti/cmd/create_config_router.go b/ziti/cmd/ziti/cmd/create_config_router.go
index d1abe6fa2..c71b38928 100644
--- a/ziti/cmd/ziti/cmd/create_config_router.go
+++ b/ziti/cmd/ziti/cmd/create_config_router.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/ziti/cmd/ziti/cmd/create_environment.go b/ziti/cmd/ziti/cmd/create_environment.go
index b41f3793f..4532f38ff 100644
--- a/ziti/cmd/ziti/cmd/create_environment.go
+++ b/ziti/cmd/ziti/cmd/create_environment.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/ziti/cmd/ziti/cmd/create_statestore.go b/ziti/cmd/ziti/cmd/create_statestore.go
index 0931f0810..4755846db 100644
--- a/ziti/cmd/ziti/cmd/create_statestore.go
+++ b/ziti/cmd/ziti/cmd/create_statestore.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/ziti/cmd/ziti/cmd/delete.go b/ziti/cmd/ziti/cmd/delete.go
index 910fac9e0..ecad39a64 100644
--- a/ziti/cmd/ziti/cmd/delete.go
+++ b/ziti/cmd/ziti/cmd/delete.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/ziti/cmd/ziti/cmd/delete_statestore.go b/ziti/cmd/ziti/cmd/delete_statestore.go
index 952cfedbd..3df88916a 100644
--- a/ziti/cmd/ziti/cmd/delete_statestore.go
+++ b/ziti/cmd/ziti/cmd/delete_statestore.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/ziti/cmd/ziti/cmd/edge_controller/common.go b/ziti/cmd/ziti/cmd/edge_controller/common.go
index ea584a4f0..d71d4d8cf 100644
--- a/ziti/cmd/ziti/cmd/edge_controller/common.go
+++ b/ziti/cmd/ziti/cmd/edge_controller/common.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/ziti/cmd/ziti/cmd/edge_controller/create.go b/ziti/cmd/ziti/cmd/edge_controller/create.go
index 673d1e64c..1ec67e1bf 100644
--- a/ziti/cmd/ziti/cmd/edge_controller/create.go
+++ b/ziti/cmd/ziti/cmd/edge_controller/create.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/ziti/cmd/ziti/cmd/edge_controller/create_authenticator.go b/ziti/cmd/ziti/cmd/edge_controller/create_authenticator.go
index 405db9ee1..f89271233 100644
--- a/ziti/cmd/ziti/cmd/edge_controller/create_authenticator.go
+++ b/ziti/cmd/ziti/cmd/edge_controller/create_authenticator.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/ziti/cmd/ziti/cmd/edge_controller/create_authenticator_updb.go b/ziti/cmd/ziti/cmd/edge_controller/create_authenticator_updb.go
index 6b70377bb..af27aec43 100644
--- a/ziti/cmd/ziti/cmd/edge_controller/create_authenticator_updb.go
+++ b/ziti/cmd/ziti/cmd/edge_controller/create_authenticator_updb.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/ziti/cmd/ziti/cmd/edge_controller/create_ca.go b/ziti/cmd/ziti/cmd/edge_controller/create_ca.go
index 64d64cdd5..7b7d64dce 100644
--- a/ziti/cmd/ziti/cmd/edge_controller/create_ca.go
+++ b/ziti/cmd/ziti/cmd/edge_controller/create_ca.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/ziti/cmd/ziti/cmd/edge_controller/create_config.go b/ziti/cmd/ziti/cmd/edge_controller/create_config.go
index 5a1d2a885..48669cb72 100644
--- a/ziti/cmd/ziti/cmd/edge_controller/create_config.go
+++ b/ziti/cmd/ziti/cmd/edge_controller/create_config.go
@@ -1,5 +1,5 @@
 /*
-	Copyright 2020 Netfoundry, Inc.
+	Copyright 2020 NetFoundry, Inc.
 
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.
diff --git a/ziti/cmd/ziti/cmd/edge_controller/create_edge_router.go b/ziti/cmd/ziti/cmd/edge_controller/create_edge_router.go
index 608fe3780..f62a8b353 100644
--- a/ziti/cmd/ziti/cmd/edge_controller/create_edge_router.go
+++ b/ziti/cmd/ziti/cmd/edge_controller/create_edge_router.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/ziti/cmd/ziti/cmd/edge_controller/create_edge_router_policy.go b/ziti/cmd/ziti/cmd/edge_controller/create_edge_router_policy.go
index 48117ad54..2a7db0861 100644
--- a/ziti/cmd/ziti/cmd/edge_controller/create_edge_router_policy.go
+++ b/ziti/cmd/ziti/cmd/edge_controller/create_edge_router_policy.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/ziti/cmd/ziti/cmd/edge_controller/create_identity.go b/ziti/cmd/ziti/cmd/edge_controller/create_identity.go
index 9dc8d8562..4fa592d59 100644
--- a/ziti/cmd/ziti/cmd/edge_controller/create_identity.go
+++ b/ziti/cmd/ziti/cmd/edge_controller/create_identity.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/ziti/cmd/ziti/cmd/edge_controller/create_service.go b/ziti/cmd/ziti/cmd/edge_controller/create_service.go
index c1a190a80..092eefcf9 100644
--- a/ziti/cmd/ziti/cmd/edge_controller/create_service.go
+++ b/ziti/cmd/ziti/cmd/edge_controller/create_service.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/ziti/cmd/ziti/cmd/edge_controller/create_service_policy.go b/ziti/cmd/ziti/cmd/edge_controller/create_service_policy.go
index 1f09e2905..a55d806e1 100644
--- a/ziti/cmd/ziti/cmd/edge_controller/create_service_policy.go
+++ b/ziti/cmd/ziti/cmd/edge_controller/create_service_policy.go
@@ -1,5 +1,5 @@
 /*
-	Copyright 2020 Netfoundry, Inc.
+	Copyright 2020 NetFoundry, Inc.
 
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.
diff --git a/ziti/cmd/ziti/cmd/edge_controller/delete.go b/ziti/cmd/ziti/cmd/edge_controller/delete.go
index 4fd2003c0..934c1b3f3 100644
--- a/ziti/cmd/ziti/cmd/edge_controller/delete.go
+++ b/ziti/cmd/ziti/cmd/edge_controller/delete.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/ziti/cmd/ziti/cmd/edge_controller/delete_authenticator.go b/ziti/cmd/ziti/cmd/edge_controller/delete_authenticator.go
index fcfdb315b..e0456dbab 100644
--- a/ziti/cmd/ziti/cmd/edge_controller/delete_authenticator.go
+++ b/ziti/cmd/ziti/cmd/edge_controller/delete_authenticator.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/ziti/cmd/ziti/cmd/edge_controller/delete_authenticator_updb.go b/ziti/cmd/ziti/cmd/edge_controller/delete_authenticator_updb.go
index cd282676c..b29b2bb3c 100644
--- a/ziti/cmd/ziti/cmd/edge_controller/delete_authenticator_updb.go
+++ b/ziti/cmd/ziti/cmd/edge_controller/delete_authenticator_updb.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/ziti/cmd/ziti/cmd/edge_controller/list.go b/ziti/cmd/ziti/cmd/edge_controller/list.go
index 622e73b76..f495cfaae 100644
--- a/ziti/cmd/ziti/cmd/edge_controller/list.go
+++ b/ziti/cmd/ziti/cmd/edge_controller/list.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/ziti/cmd/ziti/cmd/edge_controller/login.go b/ziti/cmd/ziti/cmd/edge_controller/login.go
index e80b05527..19f245902 100644
--- a/ziti/cmd/ziti/cmd/edge_controller/login.go
+++ b/ziti/cmd/ziti/cmd/edge_controller/login.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/ziti/cmd/ziti/cmd/edge_controller/password.go b/ziti/cmd/ziti/cmd/edge_controller/password.go
index 0691345ed..c263af921 100644
--- a/ziti/cmd/ziti/cmd/edge_controller/password.go
+++ b/ziti/cmd/ziti/cmd/edge_controller/password.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/ziti/cmd/ziti/cmd/edge_controller/root.go b/ziti/cmd/ziti/cmd/edge_controller/root.go
index 094827fdb..1659bd5f6 100644
--- a/ziti/cmd/ziti/cmd/edge_controller/root.go
+++ b/ziti/cmd/ziti/cmd/edge_controller/root.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/ziti/cmd/ziti/cmd/edge_controller/update.go b/ziti/cmd/ziti/cmd/edge_controller/update.go
index c765961ea..febe62a4b 100644
--- a/ziti/cmd/ziti/cmd/edge_controller/update.go
+++ b/ziti/cmd/ziti/cmd/edge_controller/update.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/ziti/cmd/ziti/cmd/edge_controller/update_authenticator.go b/ziti/cmd/ziti/cmd/edge_controller/update_authenticator.go
index 35b6ec989..5080df0f3 100644
--- a/ziti/cmd/ziti/cmd/edge_controller/update_authenticator.go
+++ b/ziti/cmd/ziti/cmd/edge_controller/update_authenticator.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/ziti/cmd/ziti/cmd/edge_controller/update_authenticator_updb.go b/ziti/cmd/ziti/cmd/edge_controller/update_authenticator_updb.go
index 3df8e0bd4..07bd402cd 100644
--- a/ziti/cmd/ziti/cmd/edge_controller/update_authenticator_updb.go
+++ b/ziti/cmd/ziti/cmd/edge_controller/update_authenticator_updb.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/ziti/cmd/ziti/cmd/edge_controller/update_ca.go b/ziti/cmd/ziti/cmd/edge_controller/update_ca.go
index 40d6450f9..e002b2be7 100644
--- a/ziti/cmd/ziti/cmd/edge_controller/update_ca.go
+++ b/ziti/cmd/ziti/cmd/edge_controller/update_ca.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/ziti/cmd/ziti/cmd/edge_controller/update_config.go b/ziti/cmd/ziti/cmd/edge_controller/update_config.go
index 59c700b90..f6a00e82d 100644
--- a/ziti/cmd/ziti/cmd/edge_controller/update_config.go
+++ b/ziti/cmd/ziti/cmd/edge_controller/update_config.go
@@ -1,5 +1,5 @@
 /*
-	Copyright 2020 Netfoundry, Inc.
+	Copyright 2020 NetFoundry, Inc.
 
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.
diff --git a/ziti/cmd/ziti/cmd/execute.go b/ziti/cmd/ziti/cmd/execute.go
index b2b6c7af6..747bc6d1d 100644
--- a/ziti/cmd/ziti/cmd/execute.go
+++ b/ziti/cmd/ziti/cmd/execute.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/ziti/cmd/ziti/cmd/execute_controller.go b/ziti/cmd/ziti/cmd/execute_controller.go
index 731864c43..3cd2e5ada 100644
--- a/ziti/cmd/ziti/cmd/execute_controller.go
+++ b/ziti/cmd/ziti/cmd/execute_controller.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/ziti/cmd/ziti/cmd/factory/factory.go b/ziti/cmd/ziti/cmd/factory/factory.go
index d90b2521d..8afebb95e 100644
--- a/ziti/cmd/ziti/cmd/factory/factory.go
+++ b/ziti/cmd/ziti/cmd/factory/factory.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/ziti/cmd/ziti/cmd/helpers/helpers.go b/ziti/cmd/ziti/cmd/helpers/helpers.go
index 263bf29e3..5050fecc0 100644
--- a/ziti/cmd/ziti/cmd/helpers/helpers.go
+++ b/ziti/cmd/ziti/cmd/helpers/helpers.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/ziti/cmd/ziti/cmd/init.go b/ziti/cmd/ziti/cmd/init.go
index 7e9954edb..48ad80947 100644
--- a/ziti/cmd/ziti/cmd/init.go
+++ b/ziti/cmd/ziti/cmd/init.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/ziti/cmd/ziti/cmd/install.go b/ziti/cmd/ziti/cmd/install.go
index 1a28ab9c9..1046a2003 100644
--- a/ziti/cmd/ziti/cmd/install.go
+++ b/ziti/cmd/ziti/cmd/install.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/ziti/cmd/ziti/cmd/install_ansible.go b/ziti/cmd/ziti/cmd/install_ansible.go
index e575d8987..3a15c3f50 100644
--- a/ziti/cmd/ziti/cmd/install_ansible.go
+++ b/ziti/cmd/ziti/cmd/install_ansible.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/ziti/cmd/ziti/cmd/install_terraform_provider_edge_controller.go b/ziti/cmd/ziti/cmd/install_terraform_provider_edge_controller.go
index 9831180ac..024780e54 100644
--- a/ziti/cmd/ziti/cmd/install_terraform_provider_edge_controller.go
+++ b/ziti/cmd/ziti/cmd/install_terraform_provider_edge_controller.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/ziti/cmd/ziti/cmd/install_ziti_ALL.go b/ziti/cmd/ziti/cmd/install_ziti_ALL.go
index 9e349c698..3606c4aae 100644
--- a/ziti/cmd/ziti/cmd/install_ziti_ALL.go
+++ b/ziti/cmd/ziti/cmd/install_ziti_ALL.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/ziti/cmd/ziti/cmd/install_ziti_controller.go b/ziti/cmd/ziti/cmd/install_ziti_controller.go
index 29c79d619..946916e75 100644
--- a/ziti/cmd/ziti/cmd/install_ziti_controller.go
+++ b/ziti/cmd/ziti/cmd/install_ziti_controller.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/ziti/cmd/ziti/cmd/install_ziti_enroller.go b/ziti/cmd/ziti/cmd/install_ziti_enroller.go
index 16c032294..1d196b17d 100644
--- a/ziti/cmd/ziti/cmd/install_ziti_enroller.go
+++ b/ziti/cmd/ziti/cmd/install_ziti_enroller.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/ziti/cmd/ziti/cmd/install_ziti_fabric.go b/ziti/cmd/ziti/cmd/install_ziti_fabric.go
index 741fff4a8..fa0256515 100644
--- a/ziti/cmd/ziti/cmd/install_ziti_fabric.go
+++ b/ziti/cmd/ziti/cmd/install_ziti_fabric.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/ziti/cmd/ziti/cmd/install_ziti_fabrictest.go b/ziti/cmd/ziti/cmd/install_ziti_fabrictest.go
index 3fe6518c4..213d3b8ba 100644
--- a/ziti/cmd/ziti/cmd/install_ziti_fabrictest.go
+++ b/ziti/cmd/ziti/cmd/install_ziti_fabrictest.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/ziti/cmd/ziti/cmd/install_ziti_mgmt_gw.go b/ziti/cmd/ziti/cmd/install_ziti_mgmt_gw.go
index b7b606bc5..900b93aa7 100644
--- a/ziti/cmd/ziti/cmd/install_ziti_mgmt_gw.go
+++ b/ziti/cmd/ziti/cmd/install_ziti_mgmt_gw.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/ziti/cmd/ziti/cmd/install_ziti_prox_c.go b/ziti/cmd/ziti/cmd/install_ziti_prox_c.go
index 77d38c712..0834ce058 100644
--- a/ziti/cmd/ziti/cmd/install_ziti_prox_c.go
+++ b/ziti/cmd/ziti/cmd/install_ziti_prox_c.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/ziti/cmd/ziti/cmd/install_ziti_proxy.go b/ziti/cmd/ziti/cmd/install_ziti_proxy.go
index 96508075b..f17e58ad3 100644
--- a/ziti/cmd/ziti/cmd/install_ziti_proxy.go
+++ b/ziti/cmd/ziti/cmd/install_ziti_proxy.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/ziti/cmd/ziti/cmd/install_ziti_router.go b/ziti/cmd/ziti/cmd/install_ziti_router.go
index 903a7b721..c9d3639ef 100644
--- a/ziti/cmd/ziti/cmd/install_ziti_router.go
+++ b/ziti/cmd/ziti/cmd/install_ziti_router.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/ziti/cmd/ziti/cmd/install_ziti_tunnel.go b/ziti/cmd/ziti/cmd/install_ziti_tunnel.go
index 678e66a2e..1985ee6a9 100644
--- a/ziti/cmd/ziti/cmd/install_ziti_tunnel.go
+++ b/ziti/cmd/ziti/cmd/install_ziti_tunnel.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/ziti/cmd/ziti/cmd/ping.go b/ziti/cmd/ziti/cmd/ping.go
index eba4f48b9..802697c9d 100644
--- a/ziti/cmd/ziti/cmd/ping.go
+++ b/ziti/cmd/ziti/cmd/ping.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/ziti/cmd/ziti/cmd/pki.go b/ziti/cmd/ziti/cmd/pki.go
index 295d24fd6..9462731ee 100644
--- a/ziti/cmd/ziti/cmd/pki.go
+++ b/ziti/cmd/ziti/cmd/pki.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.
@@ -105,7 +105,7 @@ func (options *PKIOptions) addPKIFlags(cmd *cobra.Command) {
 	cmd.MarkFlagRequired("pki-root")
 	viper.BindPFlag("pki_root", cmd.PersistentFlags().Lookup("pki-root"))
 
-	cmd.PersistentFlags().StringVarP(&options.Flags.PKIOrganization, "pki-organization", "", "Netfoundry", "Organization")
+	cmd.PersistentFlags().StringVarP(&options.Flags.PKIOrganization, "pki-organization", "", "NetFoundry", "Organization")
 	cmd.MarkFlagRequired("pki-organization")
 	viper.BindPFlag("pki-organization", cmd.PersistentFlags().Lookup("pki-organization"))
 
diff --git a/ziti/cmd/ziti/cmd/pki_create.go b/ziti/cmd/ziti/cmd/pki_create.go
index cc2fb79a9..bab89343b 100644
--- a/ziti/cmd/ziti/cmd/pki_create.go
+++ b/ziti/cmd/ziti/cmd/pki_create.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/ziti/cmd/ziti/cmd/pki_create_ca.go b/ziti/cmd/ziti/cmd/pki_create_ca.go
index 789346567..729d6093b 100644
--- a/ziti/cmd/ziti/cmd/pki_create_ca.go
+++ b/ziti/cmd/ziti/cmd/pki_create_ca.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.
@@ -66,7 +66,7 @@ func NewCmdPKICreateCA(f cmdutil.Factory, out io.Writer, errOut io.Writer) *cobr
 func (o *PKICreateCAOptions) addPKICreateCAFlags(cmd *cobra.Command) {
 	cmd.Flags().StringVarP(&o.Flags.PKIRoot, "pki-root", "", "", "Directory in which PKI resides")
 	cmd.Flags().StringVarP(&o.Flags.CAFile, "ca-file", "", "", "Dir/File name (within PKI_ROOT) in which to store new CA")
-	cmd.Flags().StringVarP(&o.Flags.CAName, "ca-name", "", "Netfoundry, Inc. Certificate Authority", "Name of CA")
+	cmd.Flags().StringVarP(&o.Flags.CAName, "ca-name", "", "NetFoundry, Inc. Certificate Authority", "Name of CA")
 	cmd.Flags().IntVarP(&o.Flags.CAExpire, "expire-limit", "", 365, "Expiration limit in days")
 	cmd.Flags().IntVarP(&o.Flags.CAMaxpath, "max-path-len", "", -1, "Intermediate maximum path length")
 	cmd.Flags().IntVarP(&o.Flags.CAPrivateKeySize, "private-key-size", "", 4096, "Size of the private key")
diff --git a/ziti/cmd/ziti/cmd/pki_create_client.go b/ziti/cmd/ziti/cmd/pki_create_client.go
index 79f95aa9f..5815598aa 100644
--- a/ziti/cmd/ziti/cmd/pki_create_client.go
+++ b/ziti/cmd/ziti/cmd/pki_create_client.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.
@@ -69,7 +69,7 @@ func (o *PKICreateClientOptions) addPKICreateClientFlags(cmd *cobra.Command) {
 	cmd.Flags().StringVarP(&o.Flags.CAName, "ca-name", "", "intermediate", "Name of Intermediate CA (within PKI_ROOT) to use to sign the new Client certificate")
 	cmd.Flags().StringVarP(&o.Flags.ClientFile, "client-file", "", "client", "Name of file (under chosen CA) in which to store new Client certificate and private key")
 	cmd.Flags().StringVarP(&o.Flags.KeyFile, "key-file", "", "", "Name of file (under chosen CA) containing private key to use when generating Client certificate")
-	cmd.Flags().StringVarP(&o.Flags.ClientName, "client-name", "", "Netfoundry, Inc. Client", "Common Name (CN) to use for new Client certificate")
+	cmd.Flags().StringVarP(&o.Flags.ClientName, "client-name", "", "NetFoundry, Inc. Client", "Common Name (CN) to use for new Client certificate")
 	cmd.Flags().StringSliceVar(&o.Flags.Email, "email", []string{}, "Email addr(s) to add to Subject Alternate Name (SAN) for new Client certificate")
 	cmd.Flags().IntVarP(&o.Flags.CAExpire, "expire-limit", "", 365, "Expiration limit in days")
 	cmd.Flags().IntVarP(&o.Flags.CAMaxpath, "max-path-len", "", -1, "Intermediate maximum path length")
diff --git a/ziti/cmd/ziti/cmd/pki_create_csr.go b/ziti/cmd/ziti/cmd/pki_create_csr.go
index 3d542c37f..afd714058 100644
--- a/ziti/cmd/ziti/cmd/pki_create_csr.go
+++ b/ziti/cmd/ziti/cmd/pki_create_csr.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.
@@ -64,7 +64,7 @@ func NewCmdPKICreateCSR(f cmdutil.Factory, out io.Writer, errOut io.Writer) *cob
 
 func (o *PKICreateCSROptions) addPKICreateCSRFlags(cmd *cobra.Command) {
 	cmd.Flags().StringVarP(&o.Flags.CSRFile, "csr-file", "", "csr", "File in which to store new CSR")
-	cmd.Flags().StringVarP(&o.Flags.CSRName, "csr-name", "", "Netfoundry, Inc. CSR", "Name of CSR")
+	cmd.Flags().StringVarP(&o.Flags.CSRName, "csr-name", "", "NetFoundry, Inc. CSR", "Name of CSR")
 	cmd.Flags().StringVarP(&o.Flags.KeyName, "key-name", "", "", "Name of file that contains private key for CSR")
 	cmd.Flags().IntVarP(&o.Flags.CAExpire, "expire-limit", "", 365, "Expiration limit in days")
 	cmd.Flags().IntVarP(&o.Flags.CAMaxpath, "max-path-len", "", -1, "Intermediate maximum path length")
diff --git a/ziti/cmd/ziti/cmd/pki_create_intermediate.go b/ziti/cmd/ziti/cmd/pki_create_intermediate.go
index 5b7b2d33e..1b8b8a301 100644
--- a/ziti/cmd/ziti/cmd/pki_create_intermediate.go
+++ b/ziti/cmd/ziti/cmd/pki_create_intermediate.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.
@@ -68,7 +68,7 @@ func (o *PKICreateIntermediateOptions) addPKICreateIntermediateFlags(cmd *cobra.
 	cmd.Flags().StringVarP(&o.Flags.PKIRoot, "pki-root", "", "", "Directory in which PKI resides")
 	cmd.Flags().StringVarP(&o.Flags.CAName, "ca-name", "", "ca", "Name of CA (within PKI_ROOT) to use to sign the new Intermediate CA")
 	cmd.Flags().StringVarP(&o.Flags.IntermediateFile, "intermediate-file", "", "intermediate", "Dir/File name (within PKI_ROOT) in which to store new Intermediate CA")
-	cmd.Flags().StringVarP(&o.Flags.IntermediateName, "intermediate-name", "", "Netfoundry, Inc. Intermediate CA", "Common Name (CN) to use for new Intermediate CA")
+	cmd.Flags().StringVarP(&o.Flags.IntermediateName, "intermediate-name", "", "NetFoundry, Inc. Intermediate CA", "Common Name (CN) to use for new Intermediate CA")
 	cmd.Flags().IntVarP(&o.Flags.CAExpire, "expire-limit", "", 365, "Expiration limit in days")
 	cmd.Flags().IntVarP(&o.Flags.CAMaxpath, "max-path-len", "", 0, "Intermediate maximum path length")
 	cmd.Flags().IntVarP(&o.Flags.CAPrivateKeySize, "private-key-size", "", 4096, "Size of the private key")
diff --git a/ziti/cmd/ziti/cmd/pki_create_key.go b/ziti/cmd/ziti/cmd/pki_create_key.go
index 89efe9280..c8d7cb4a1 100644
--- a/ziti/cmd/ziti/cmd/pki_create_key.go
+++ b/ziti/cmd/ziti/cmd/pki_create_key.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/ziti/cmd/ziti/cmd/pki_create_server.go b/ziti/cmd/ziti/cmd/pki_create_server.go
index 6c5fc9df1..2bea48326 100644
--- a/ziti/cmd/ziti/cmd/pki_create_server.go
+++ b/ziti/cmd/ziti/cmd/pki_create_server.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.
@@ -69,7 +69,7 @@ func (o *PKICreateServerOptions) addPKICreateServerFlags(cmd *cobra.Command) {
 	cmd.Flags().StringVarP(&o.Flags.CAName, "ca-name", "", "intermediate", "Name of Intermediate CA (within PKI_ROOT) to use to sign the new Server certificate")
 	cmd.Flags().StringVarP(&o.Flags.ServerFile, "server-file", "", "server", "Name of file (under chosen CA) in which to store new Server certificate and private key")
 	cmd.Flags().StringVarP(&o.Flags.KeyFile, "key-file", "", "", "Name of file (under chosen CA) containing private key to use when generating Server certificate")
-	cmd.Flags().StringVarP(&o.Flags.ServerName, "server-name", "", "Netfoundry, Inc. Server", "Common Name (CN) to use for new Server certificate")
+	cmd.Flags().StringVarP(&o.Flags.ServerName, "server-name", "", "NetFoundry, Inc. Server", "Common Name (CN) to use for new Server certificate")
 	cmd.Flags().StringSliceVar(&o.Flags.DNSName, "dns", []string{}, "DNS name(s) to add to Subject Alternate Name (SAN) for new Server certificate")
 	cmd.Flags().StringSliceVar(&o.Flags.IP, "ip", []string{}, "IP addr(s) to add to Subject Alternate Name (SAN) for new Server certificate")
 	cmd.Flags().IntVarP(&o.Flags.CAExpire, "expire-limit", "", 365, "Expiration limit in days")
diff --git a/ziti/cmd/ziti/cmd/playbook.go b/ziti/cmd/ziti/cmd/playbook.go
index 556392c89..38b4af697 100644
--- a/ziti/cmd/ziti/cmd/playbook.go
+++ b/ziti/cmd/ziti/cmd/playbook.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/ziti/cmd/ziti/cmd/ps.go b/ziti/cmd/ziti/cmd/ps.go
index 67de1b44b..48cfd946d 100644
--- a/ziti/cmd/ziti/cmd/ps.go
+++ b/ziti/cmd/ziti/cmd/ps.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/ziti/cmd/ziti/cmd/ps_gc.go b/ziti/cmd/ziti/cmd/ps_gc.go
index ff6a41ec9..4b583a3b2 100644
--- a/ziti/cmd/ziti/cmd/ps_gc.go
+++ b/ziti/cmd/ziti/cmd/ps_gc.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/ziti/cmd/ziti/cmd/ps_get.go b/ziti/cmd/ziti/cmd/ps_get.go
index b7e242d53..6329578eb 100644
--- a/ziti/cmd/ziti/cmd/ps_get.go
+++ b/ziti/cmd/ziti/cmd/ps_get.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/ziti/cmd/ziti/cmd/ps_goversion.go b/ziti/cmd/ziti/cmd/ps_goversion.go
index c748187b8..0ebccf719 100644
--- a/ziti/cmd/ziti/cmd/ps_goversion.go
+++ b/ziti/cmd/ziti/cmd/ps_goversion.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/ziti/cmd/ziti/cmd/ps_memstats.go b/ziti/cmd/ziti/cmd/ps_memstats.go
index f28509c0b..3ffa0a80a 100644
--- a/ziti/cmd/ziti/cmd/ps_memstats.go
+++ b/ziti/cmd/ziti/cmd/ps_memstats.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/ziti/cmd/ziti/cmd/ps_pprof_cpu.go b/ziti/cmd/ziti/cmd/ps_pprof_cpu.go
index d15774ed4..287c07955 100644
--- a/ziti/cmd/ziti/cmd/ps_pprof_cpu.go
+++ b/ziti/cmd/ziti/cmd/ps_pprof_cpu.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/ziti/cmd/ziti/cmd/ps_pprof_heap.go b/ziti/cmd/ziti/cmd/ps_pprof_heap.go
index 1869f2701..018e07996 100644
--- a/ziti/cmd/ziti/cmd/ps_pprof_heap.go
+++ b/ziti/cmd/ziti/cmd/ps_pprof_heap.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/ziti/cmd/ziti/cmd/ps_setgc.go b/ziti/cmd/ziti/cmd/ps_setgc.go
index 790c45f1c..8eb96550d 100644
--- a/ziti/cmd/ziti/cmd/ps_setgc.go
+++ b/ziti/cmd/ziti/cmd/ps_setgc.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/ziti/cmd/ziti/cmd/ps_stack.go b/ziti/cmd/ziti/cmd/ps_stack.go
index 235871500..732835053 100644
--- a/ziti/cmd/ziti/cmd/ps_stack.go
+++ b/ziti/cmd/ziti/cmd/ps_stack.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/ziti/cmd/ziti/cmd/ps_stats.go b/ziti/cmd/ziti/cmd/ps_stats.go
index 94078a42f..bc0bd245b 100644
--- a/ziti/cmd/ziti/cmd/ps_stats.go
+++ b/ziti/cmd/ziti/cmd/ps_stats.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/ziti/cmd/ziti/cmd/ps_trace.go b/ziti/cmd/ziti/cmd/ps_trace.go
index 851888649..6ad583429 100644
--- a/ziti/cmd/ziti/cmd/ps_trace.go
+++ b/ziti/cmd/ziti/cmd/ps_trace.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/ziti/cmd/ziti/cmd/pscmd.go b/ziti/cmd/ziti/cmd/pscmd.go
index 3832eaadd..1a4a02dd4 100644
--- a/ziti/cmd/ziti/cmd/pscmd.go
+++ b/ziti/cmd/ziti/cmd/pscmd.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/ziti/cmd/ziti/cmd/table/table.go b/ziti/cmd/ziti/cmd/table/table.go
index ac3075e44..f695c5d11 100644
--- a/ziti/cmd/ziti/cmd/table/table.go
+++ b/ziti/cmd/ziti/cmd/table/table.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/ziti/cmd/ziti/cmd/templates/command_groups.go b/ziti/cmd/ziti/cmd/templates/command_groups.go
index 0b003c481..ffb16afac 100644
--- a/ziti/cmd/ziti/cmd/templates/command_groups.go
+++ b/ziti/cmd/ziti/cmd/templates/command_groups.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/ziti/cmd/ziti/cmd/templates/markdown.go b/ziti/cmd/ziti/cmd/templates/markdown.go
index 668c19864..0569757f9 100644
--- a/ziti/cmd/ziti/cmd/templates/markdown.go
+++ b/ziti/cmd/ziti/cmd/templates/markdown.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/ziti/cmd/ziti/cmd/templates/normalizers.go b/ziti/cmd/ziti/cmd/templates/normalizers.go
index 8daedd59e..a27932f73 100644
--- a/ziti/cmd/ziti/cmd/templates/normalizers.go
+++ b/ziti/cmd/ziti/cmd/templates/normalizers.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/ziti/cmd/ziti/cmd/templates/templater.go b/ziti/cmd/ziti/cmd/templates/templater.go
index 2f40f7541..6061d2872 100644
--- a/ziti/cmd/ziti/cmd/templates/templater.go
+++ b/ziti/cmd/ziti/cmd/templates/templater.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/ziti/cmd/ziti/cmd/templates/templates.go b/ziti/cmd/ziti/cmd/templates/templates.go
index 3901b77f8..a0f3c8527 100644
--- a/ziti/cmd/ziti/cmd/templates/templates.go
+++ b/ziti/cmd/ziti/cmd/templates/templates.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/ziti/cmd/ziti/cmd/uninstall.go b/ziti/cmd/ziti/cmd/uninstall.go
index 247245954..d31396130 100644
--- a/ziti/cmd/ziti/cmd/uninstall.go
+++ b/ziti/cmd/ziti/cmd/uninstall.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/ziti/cmd/ziti/cmd/uninstall_ziti_controller.go b/ziti/cmd/ziti/cmd/uninstall_ziti_controller.go
index 7e139ddc2..16a478709 100644
--- a/ziti/cmd/ziti/cmd/uninstall_ziti_controller.go
+++ b/ziti/cmd/ziti/cmd/uninstall_ziti_controller.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/ziti/cmd/ziti/cmd/uninstall_ziti_enroller.go b/ziti/cmd/ziti/cmd/uninstall_ziti_enroller.go
index a4780414c..2e8932fa1 100644
--- a/ziti/cmd/ziti/cmd/uninstall_ziti_enroller.go
+++ b/ziti/cmd/ziti/cmd/uninstall_ziti_enroller.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/ziti/cmd/ziti/cmd/uninstall_ziti_fabric.go b/ziti/cmd/ziti/cmd/uninstall_ziti_fabric.go
index 24e8e1ad9..2cac6364d 100644
--- a/ziti/cmd/ziti/cmd/uninstall_ziti_fabric.go
+++ b/ziti/cmd/ziti/cmd/uninstall_ziti_fabric.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/ziti/cmd/ziti/cmd/uninstall_ziti_fabrictest.go b/ziti/cmd/ziti/cmd/uninstall_ziti_fabrictest.go
index db16dc1cd..3eccd8209 100644
--- a/ziti/cmd/ziti/cmd/uninstall_ziti_fabrictest.go
+++ b/ziti/cmd/ziti/cmd/uninstall_ziti_fabrictest.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/ziti/cmd/ziti/cmd/uninstall_ziti_mgmt_gw.go b/ziti/cmd/ziti/cmd/uninstall_ziti_mgmt_gw.go
index a0e5fa323..015abab11 100644
--- a/ziti/cmd/ziti/cmd/uninstall_ziti_mgmt_gw.go
+++ b/ziti/cmd/ziti/cmd/uninstall_ziti_mgmt_gw.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/ziti/cmd/ziti/cmd/uninstall_ziti_proxy.go b/ziti/cmd/ziti/cmd/uninstall_ziti_proxy.go
index 27713b94a..134e724fe 100644
--- a/ziti/cmd/ziti/cmd/uninstall_ziti_proxy.go
+++ b/ziti/cmd/ziti/cmd/uninstall_ziti_proxy.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/ziti/cmd/ziti/cmd/uninstall_ziti_proxy_c.go b/ziti/cmd/ziti/cmd/uninstall_ziti_proxy_c.go
index 509a3bcc6..28745a618 100644
--- a/ziti/cmd/ziti/cmd/uninstall_ziti_proxy_c.go
+++ b/ziti/cmd/ziti/cmd/uninstall_ziti_proxy_c.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/ziti/cmd/ziti/cmd/uninstall_ziti_router.go b/ziti/cmd/ziti/cmd/uninstall_ziti_router.go
index c110f6f04..1f64e55d9 100644
--- a/ziti/cmd/ziti/cmd/uninstall_ziti_router.go
+++ b/ziti/cmd/ziti/cmd/uninstall_ziti_router.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/ziti/cmd/ziti/cmd/uninstall_ziti_tunnel.go b/ziti/cmd/ziti/cmd/uninstall_ziti_tunnel.go
index fd1044b08..6938e8832 100644
--- a/ziti/cmd/ziti/cmd/uninstall_ziti_tunnel.go
+++ b/ziti/cmd/ziti/cmd/uninstall_ziti_tunnel.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/ziti/cmd/ziti/cmd/update.go b/ziti/cmd/ziti/cmd/update.go
index b57910b14..a3a60449e 100644
--- a/ziti/cmd/ziti/cmd/update.go
+++ b/ziti/cmd/ziti/cmd/update.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/ziti/cmd/ziti/cmd/upgrade.go b/ziti/cmd/ziti/cmd/upgrade.go
index 37c7aff55..1455b0881 100644
--- a/ziti/cmd/ziti/cmd/upgrade.go
+++ b/ziti/cmd/ziti/cmd/upgrade.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/ziti/cmd/ziti/cmd/upgrade_ziti.go b/ziti/cmd/ziti/cmd/upgrade_ziti.go
index 70592d40b..6248aa039 100644
--- a/ziti/cmd/ziti/cmd/upgrade_ziti.go
+++ b/ziti/cmd/ziti/cmd/upgrade_ziti.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/ziti/cmd/ziti/cmd/upgrade_ziti_controller.go b/ziti/cmd/ziti/cmd/upgrade_ziti_controller.go
index 4db663ae9..b658ea8e9 100644
--- a/ziti/cmd/ziti/cmd/upgrade_ziti_controller.go
+++ b/ziti/cmd/ziti/cmd/upgrade_ziti_controller.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/ziti/cmd/ziti/cmd/upgrade_ziti_enroller.go b/ziti/cmd/ziti/cmd/upgrade_ziti_enroller.go
index 1ea72bd1d..96fa01981 100644
--- a/ziti/cmd/ziti/cmd/upgrade_ziti_enroller.go
+++ b/ziti/cmd/ziti/cmd/upgrade_ziti_enroller.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/ziti/cmd/ziti/cmd/upgrade_ziti_fabric.go b/ziti/cmd/ziti/cmd/upgrade_ziti_fabric.go
index 7e77b7030..ddfa811af 100644
--- a/ziti/cmd/ziti/cmd/upgrade_ziti_fabric.go
+++ b/ziti/cmd/ziti/cmd/upgrade_ziti_fabric.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/ziti/cmd/ziti/cmd/upgrade_ziti_fabrictest.go b/ziti/cmd/ziti/cmd/upgrade_ziti_fabrictest.go
index e22cf068c..78a9b36e2 100644
--- a/ziti/cmd/ziti/cmd/upgrade_ziti_fabrictest.go
+++ b/ziti/cmd/ziti/cmd/upgrade_ziti_fabrictest.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/ziti/cmd/ziti/cmd/upgrade_ziti_mgmt_gw.go b/ziti/cmd/ziti/cmd/upgrade_ziti_mgmt_gw.go
index 6833c39e0..8f1284108 100644
--- a/ziti/cmd/ziti/cmd/upgrade_ziti_mgmt_gw.go
+++ b/ziti/cmd/ziti/cmd/upgrade_ziti_mgmt_gw.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/ziti/cmd/ziti/cmd/upgrade_ziti_prox_c.go b/ziti/cmd/ziti/cmd/upgrade_ziti_prox_c.go
index 0bd81cfa1..3bb306258 100644
--- a/ziti/cmd/ziti/cmd/upgrade_ziti_prox_c.go
+++ b/ziti/cmd/ziti/cmd/upgrade_ziti_prox_c.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/ziti/cmd/ziti/cmd/upgrade_ziti_proxy.go b/ziti/cmd/ziti/cmd/upgrade_ziti_proxy.go
index 9b9c87154..d4fd1d143 100644
--- a/ziti/cmd/ziti/cmd/upgrade_ziti_proxy.go
+++ b/ziti/cmd/ziti/cmd/upgrade_ziti_proxy.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/ziti/cmd/ziti/cmd/upgrade_ziti_router.go b/ziti/cmd/ziti/cmd/upgrade_ziti_router.go
index 7883164d9..b66065343 100644
--- a/ziti/cmd/ziti/cmd/upgrade_ziti_router.go
+++ b/ziti/cmd/ziti/cmd/upgrade_ziti_router.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/ziti/cmd/ziti/cmd/upgrade_ziti_tunnel.go b/ziti/cmd/ziti/cmd/upgrade_ziti_tunnel.go
index 0a71852a0..088552d9e 100644
--- a/ziti/cmd/ziti/cmd/upgrade_ziti_tunnel.go
+++ b/ziti/cmd/ziti/cmd/upgrade_ziti_tunnel.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/ziti/cmd/ziti/cmd/use.go b/ziti/cmd/ziti/cmd/use.go
index 3daab19b5..6b161cda8 100644
--- a/ziti/cmd/ziti/cmd/use.go
+++ b/ziti/cmd/ziti/cmd/use.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/ziti/cmd/ziti/cmd/version.go b/ziti/cmd/ziti/cmd/version.go
index 8f6e2685a..0d5f850df 100644
--- a/ziti/cmd/ziti/cmd/version.go
+++ b/ziti/cmd/ziti/cmd/version.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/ziti/cmd/ziti/constants/constants.go b/ziti/cmd/ziti/constants/constants.go
index da669356e..1438e465b 100644
--- a/ziti/cmd/ziti/constants/constants.go
+++ b/ziti/cmd/ziti/constants/constants.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/ziti/cmd/ziti/internal/log/log.go b/ziti/cmd/ziti/internal/log/log.go
index e86ae5fd6..7ef7cf231 100644
--- a/ziti/cmd/ziti/internal/log/log.go
+++ b/ziti/cmd/ziti/internal/log/log.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/ziti/cmd/ziti/main.go b/ziti/cmd/ziti/main.go
index 6eb2c6c7e..59c139e8c 100644
--- a/ziti/cmd/ziti/main.go
+++ b/ziti/cmd/ziti/main.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/ziti/cmd/ziti/util/colors.go b/ziti/cmd/ziti/util/colors.go
index 22567d97d..ad64b2389 100644
--- a/ziti/cmd/ziti/util/colors.go
+++ b/ziti/cmd/ziti/util/colors.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/ziti/cmd/ziti/util/commands.go b/ziti/cmd/ziti/util/commands.go
index 3f85ab42c..f40afba6a 100644
--- a/ziti/cmd/ziti/util/commands.go
+++ b/ziti/cmd/ziti/util/commands.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/ziti/cmd/ziti/util/dirs.go b/ziti/cmd/ziti/util/dirs.go
index 697dfb16f..58c96ae4d 100644
--- a/ziti/cmd/ziti/util/dirs.go
+++ b/ziti/cmd/ziti/util/dirs.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/ziti/cmd/ziti/util/files.go b/ziti/cmd/ziti/util/files.go
index a50cd9026..1d1bbe86e 100644
--- a/ziti/cmd/ziti/util/files.go
+++ b/ziti/cmd/ziti/util/files.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/ziti/cmd/ziti/util/padding.go b/ziti/cmd/ziti/util/padding.go
index acf2b9219..3911e744c 100644
--- a/ziti/cmd/ziti/util/padding.go
+++ b/ziti/cmd/ziti/util/padding.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/ziti/cmd/ziti/util/pickers.go b/ziti/cmd/ziti/util/pickers.go
index f5a2dad88..21a732ba7 100644
--- a/ziti/cmd/ziti/util/pickers.go
+++ b/ziti/cmd/ziti/util/pickers.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/ziti/cmd/ziti/util/rest.go b/ziti/cmd/ziti/util/rest.go
index 0a908a713..ce9f9ec72 100644
--- a/ziti/cmd/ziti/util/rest.go
+++ b/ziti/cmd/ziti/util/rest.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/ziti/cmd/ziti/util/strings.go b/ziti/cmd/ziti/util/strings.go
index 785319c2d..fbbe38190 100644
--- a/ziti/cmd/ziti/util/strings.go
+++ b/ziti/cmd/ziti/util/strings.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/ziti/cmd/ziti/util/suggestions.go b/ziti/cmd/ziti/util/suggestions.go
index 56f096fdb..d95d4acc3 100644
--- a/ziti/cmd/ziti/util/suggestions.go
+++ b/ziti/cmd/ziti/util/suggestions.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/ziti/goprocess/gp.go b/ziti/goprocess/gp.go
index 068e90d7a..8e88d8c45 100644
--- a/ziti/goprocess/gp.go
+++ b/ziti/goprocess/gp.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/ziti/pki/certificate/certificate.go b/ziti/pki/certificate/certificate.go
index 4e704c904..16c6b270c 100644
--- a/ziti/pki/certificate/certificate.go
+++ b/ziti/pki/certificate/certificate.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/ziti/pki/pki/pki.go b/ziti/pki/pki/pki.go
index 1ad9089df..0bf4e2e89 100644
--- a/ziti/pki/pki/pki.go
+++ b/ziti/pki/pki/pki.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/ziti/pki/pki/template.go b/ziti/pki/pki/template.go
index a6add16b5..1b32a2351 100644
--- a/ziti/pki/pki/template.go
+++ b/ziti/pki/pki/template.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/ziti/pki/store/local.go b/ziti/pki/store/local.go
index 509241ce1..f24cd558f 100644
--- a/ziti/pki/store/local.go
+++ b/ziti/pki/store/local.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/ziti/pki/store/store.go b/ziti/pki/store/store.go
index ea8c95c67..ac61ba1e8 100644
--- a/ziti/pki/store/store.go
+++ b/ziti/pki/store/store.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/ziti/provisioner/main.go b/ziti/provisioner/main.go
index bacda549e..5ce2748c5 100644
--- a/ziti/provisioner/main.go
+++ b/ziti/provisioner/main.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/ziti/provisioner/vagrant.go b/ziti/provisioner/vagrant.go
index ffdd06098..e64453e4a 100644
--- a/ziti/provisioner/vagrant.go
+++ b/ziti/provisioner/vagrant.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/ziti/signal/signal.go b/ziti/signal/signal.go
index e5317c20d..735f46d47 100644
--- a/ziti/signal/signal.go
+++ b/ziti/signal/signal.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/ziti/util/util.go b/ziti/util/util.go
index b5472b87b..98c6a68cd 100644
--- a/ziti/util/util.go
+++ b/ziti/util/util.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/ziti/vagrantutil/command.go b/ziti/vagrantutil/command.go
index baf389b54..3c8ee9af2 100644
--- a/ziti/vagrantutil/command.go
+++ b/ziti/vagrantutil/command.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/ziti/vagrantutil/error.go b/ziti/vagrantutil/error.go
index 7c6222543..6ada1feaa 100644
--- a/ziti/vagrantutil/error.go
+++ b/ziti/vagrantutil/error.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/ziti/vagrantutil/parse.go b/ziti/vagrantutil/parse.go
index 2c2de6a04..dddf6d660 100644
--- a/ziti/vagrantutil/parse.go
+++ b/ziti/vagrantutil/parse.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/ziti/vagrantutil/stringer.go b/ziti/vagrantutil/stringer.go
index 7b65de446..2fc6b2e54 100644
--- a/ziti/vagrantutil/stringer.go
+++ b/ziti/vagrantutil/stringer.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/ziti/vagrantutil/vagrant.go b/ziti/vagrantutil/vagrant.go
index 51d60d3c6..f3aa28a3b 100644
--- a/ziti/vagrantutil/vagrant.go
+++ b/ziti/vagrantutil/vagrant.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.