diff --git a/controller/config.go b/controller/config.go
index 44216fe67..90714a2c8 100644
--- a/controller/config.go
+++ b/controller/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/controller/controller.go b/controller/controller.go
index a4072546b..170116823 100644
--- a/controller/controller.go
+++ b/controller/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.
@@ -28,6 +28,7 @@ import (
 	"github.com/netfoundry/ziti-fabric/xmgmt"
 	"github.com/netfoundry/ziti-foundation/channel2"
 	"github.com/netfoundry/ziti-foundation/profiler"
+	"github.com/sirupsen/logrus"
 )
 
 type Controller struct {
@@ -43,6 +44,8 @@ type Controller struct {
 }
 
 func NewController(cfg *Config) (*Controller, error) {
+	logrus.Infof("hello")
+
 	c := &Controller{
 		config: cfg,
 	}
diff --git a/controller/db/db.go b/controller/db/db.go
index 19052dc77..464e6572b 100644
--- a/controller/db/db.go
+++ b/controller/db/db.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/controller/handler_ctrl/accept.go b/controller/handler_ctrl/accept.go
index effd9b71d..f7202eed9 100644
--- a/controller/handler_ctrl/accept.go
+++ b/controller/handler_ctrl/accept.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/controller/handler_ctrl/bind.go b/controller/handler_ctrl/bind.go
index b24126cb2..be4db8eed 100644
--- a/controller/handler_ctrl/bind.go
+++ b/controller/handler_ctrl/bind.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/controller/handler_ctrl/bind_service_request.go b/controller/handler_ctrl/bind_service_request.go
index 2c121c26b..7b60a1e40 100644
--- a/controller/handler_ctrl/bind_service_request.go
+++ b/controller/handler_ctrl/bind_service_request.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/controller/handler_ctrl/close.go b/controller/handler_ctrl/close.go
index e6e52b6f4..a8140609a 100644
--- a/controller/handler_ctrl/close.go
+++ b/controller/handler_ctrl/close.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/controller/handler_ctrl/connect.go b/controller/handler_ctrl/connect.go
index 9268ecb59..23fe2755c 100644
--- a/controller/handler_ctrl/connect.go
+++ b/controller/handler_ctrl/connect.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/controller/handler_ctrl/fault.go b/controller/handler_ctrl/fault.go
index 4aaeb4a77..029a66624 100644
--- a/controller/handler_ctrl/fault.go
+++ b/controller/handler_ctrl/fault.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/controller/handler_ctrl/inspect.go b/controller/handler_ctrl/inspect.go
index a0d33b2d3..20aec1600 100644
--- a/controller/handler_ctrl/inspect.go
+++ b/controller/handler_ctrl/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/controller/handler_ctrl/link.go b/controller/handler_ctrl/link.go
index 65f66655b..6b2ad6bab 100644
--- a/controller/handler_ctrl/link.go
+++ b/controller/handler_ctrl/link.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/controller/handler_ctrl/metrics.go b/controller/handler_ctrl/metrics.go
index 1a01b4ca4..10cdff846 100644
--- a/controller/handler_ctrl/metrics.go
+++ b/controller/handler_ctrl/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/controller/handler_ctrl/session_request.go b/controller/handler_ctrl/session_request.go
index 104df4dbf..fdce6aead 100644
--- a/controller/handler_ctrl/session_request.go
+++ b/controller/handler_ctrl/session_request.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/controller/handler_mgmt/accept.go b/controller/handler_mgmt/accept.go
index bcaee70a8..4aec2995b 100644
--- a/controller/handler_mgmt/accept.go
+++ b/controller/handler_mgmt/accept.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/controller/handler_mgmt/bind.go b/controller/handler_mgmt/bind.go
index bdb311acd..ba6652099 100644
--- a/controller/handler_mgmt/bind.go
+++ b/controller/handler_mgmt/bind.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/controller/handler_mgmt/close.go b/controller/handler_mgmt/close.go
index 8bce02c7f..4e1a97bcd 100644
--- a/controller/handler_mgmt/close.go
+++ b/controller/handler_mgmt/close.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/controller/handler_mgmt/connect.go b/controller/handler_mgmt/connect.go
index a3e324d75..09a3fc81b 100644
--- a/controller/handler_mgmt/connect.go
+++ b/controller/handler_mgmt/connect.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/controller/handler_mgmt/create_router.go b/controller/handler_mgmt/create_router.go
index 4ee6f9272..5b79c7d54 100644
--- a/controller/handler_mgmt/create_router.go
+++ b/controller/handler_mgmt/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/controller/handler_mgmt/create_service.go b/controller/handler_mgmt/create_service.go
index 99e2536cc..4e779715a 100644
--- a/controller/handler_mgmt/create_service.go
+++ b/controller/handler_mgmt/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/controller/handler_mgmt/get_service.go b/controller/handler_mgmt/get_service.go
index c7d1785e1..9925465c6 100644
--- a/controller/handler_mgmt/get_service.go
+++ b/controller/handler_mgmt/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/controller/handler_mgmt/inspect.go b/controller/handler_mgmt/inspect.go
index 4e8c9ba21..165d0d2af 100644
--- a/controller/handler_mgmt/inspect.go
+++ b/controller/handler_mgmt/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/controller/handler_mgmt/list_links.go b/controller/handler_mgmt/list_links.go
index 581b74e03..8d64b900c 100644
--- a/controller/handler_mgmt/list_links.go
+++ b/controller/handler_mgmt/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/controller/handler_mgmt/list_routers.go b/controller/handler_mgmt/list_routers.go
index 983c4437f..69d362fb3 100644
--- a/controller/handler_mgmt/list_routers.go
+++ b/controller/handler_mgmt/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/controller/handler_mgmt/list_services.go b/controller/handler_mgmt/list_services.go
index f8d0c2692..090e675f2 100644
--- a/controller/handler_mgmt/list_services.go
+++ b/controller/handler_mgmt/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/controller/handler_mgmt/list_sessions.go b/controller/handler_mgmt/list_sessions.go
index 465476b4b..caca93504 100644
--- a/controller/handler_mgmt/list_sessions.go
+++ b/controller/handler_mgmt/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/controller/handler_mgmt/remove_router.go b/controller/handler_mgmt/remove_router.go
index 9a0f496d4..ea0a1e02a 100644
--- a/controller/handler_mgmt/remove_router.go
+++ b/controller/handler_mgmt/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/controller/handler_mgmt/remove_service.go b/controller/handler_mgmt/remove_service.go
index 2ce523263..7c285338a 100644
--- a/controller/handler_mgmt/remove_service.go
+++ b/controller/handler_mgmt/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/controller/handler_mgmt/remove_session.go b/controller/handler_mgmt/remove_session.go
index 840324210..f8a52e99c 100644
--- a/controller/handler_mgmt/remove_session.go
+++ b/controller/handler_mgmt/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/controller/handler_mgmt/set_link_cost.go b/controller/handler_mgmt/set_link_cost.go
index 4a2505f9c..7e6d27990 100644
--- a/controller/handler_mgmt/set_link_cost.go
+++ b/controller/handler_mgmt/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/controller/handler_mgmt/set_link_down.go b/controller/handler_mgmt/set_link_down.go
index 0fa8337fc..1fc461917 100644
--- a/controller/handler_mgmt/set_link_down.go
+++ b/controller/handler_mgmt/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/controller/handler_mgmt/stream_metrics.go b/controller/handler_mgmt/stream_metrics.go
index 2c4c022d3..c49d9b73d 100644
--- a/controller/handler_mgmt/stream_metrics.go
+++ b/controller/handler_mgmt/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/controller/handler_mgmt/stream_sessions.go b/controller/handler_mgmt/stream_sessions.go
index ac73d057f..2f1a3b5d6 100644
--- a/controller/handler_mgmt/stream_sessions.go
+++ b/controller/handler_mgmt/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/controller/handler_mgmt/stream_toggle_pipe_traces.go b/controller/handler_mgmt/stream_toggle_pipe_traces.go
index e0484e960..46e6bdb6f 100644
--- a/controller/handler_mgmt/stream_toggle_pipe_traces.go
+++ b/controller/handler_mgmt/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/controller/handler_mgmt/stream_traces.go b/controller/handler_mgmt/stream_traces.go
index 86322fb61..1e862e49e 100644
--- a/controller/handler_mgmt/stream_traces.go
+++ b/controller/handler_mgmt/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/controller/network/assembly.go b/controller/network/assembly.go
index f37c67280..9eebf9436 100644
--- a/controller/network/assembly.go
+++ b/controller/network/assembly.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/controller/network/circuit.go b/controller/network/circuit.go
index 0e78947db..aa3b3f3e0 100644
--- a/controller/network/circuit.go
+++ b/controller/network/circuit.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/controller/network/circuit_test.go b/controller/network/circuit_test.go
index 861903db8..b3537ed77 100644
--- a/controller/network/circuit_test.go
+++ b/controller/network/circuit_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/controller/network/handler.go b/controller/network/handler.go
index 508c7f2ef..c04798cb5 100644
--- a/controller/network/handler.go
+++ b/controller/network/handler.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/controller/network/link.go b/controller/network/link.go
index edd2cfd1d..63cd66daa 100644
--- a/controller/network/link.go
+++ b/controller/network/link.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/controller/network/link_controller.go b/controller/network/link_controller.go
index 6ea37e558..6dc174995 100644
--- a/controller/network/link_controller.go
+++ b/controller/network/link_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/controller/network/link_controller_test.go b/controller/network/link_controller_test.go
index 83ef8c189..b7d6830c4 100644
--- a/controller/network/link_controller_test.go
+++ b/controller/network/link_controller_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/controller/network/network.go b/controller/network/network.go
index 8a600b655..f99a4ea17 100644
--- a/controller/network/network.go
+++ b/controller/network/network.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/controller/network/options.go b/controller/network/options.go
index 1f4076836..5257ade6c 100644
--- a/controller/network/options.go
+++ b/controller/network/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/controller/network/path.go b/controller/network/path.go
index 614e391a1..c782bc268 100644
--- a/controller/network/path.go
+++ b/controller/network/path.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/controller/network/router.go b/controller/network/router.go
index 8c07a4d58..4e7533a9d 100644
--- a/controller/network/router.go
+++ b/controller/network/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/controller/network/router_store.go b/controller/network/router_store.go
index 55a6df734..b681e81a9 100644
--- a/controller/network/router_store.go
+++ b/controller/network/router_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/controller/network/service.go b/controller/network/service.go
index 72551be0e..6f9fa3ac5 100644
--- a/controller/network/service.go
+++ b/controller/network/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/controller/network/service_store.go b/controller/network/service_store.go
index 23b0f9012..feb74b632 100644
--- a/controller/network/service_store.go
+++ b/controller/network/service_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/controller/network/session.go b/controller/network/session.go
index 4a54a8fa5..e5b8ac730 100644
--- a/controller/network/session.go
+++ b/controller/network/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/controller/network/session_lifecycle.go b/controller/network/session_lifecycle.go
index fc06d4c67..b8442ab45 100644
--- a/controller/network/session_lifecycle.go
+++ b/controller/network/session_lifecycle.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/controller/network/smart.go b/controller/network/smart.go
index 45334ae68..29b5c37a9 100644
--- a/controller/network/smart.go
+++ b/controller/network/smart.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/ctrl_msg/messages.go b/ctrl_msg/messages.go
index b50f9d18a..5b96c1001 100644
--- a/ctrl_msg/messages.go
+++ b/ctrl_msg/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/metrics/channel_reporter.go b/metrics/channel_reporter.go
index 576522d39..44051b69b 100644
--- a/metrics/channel_reporter.go
+++ b/metrics/channel_reporter.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/metrics/config.go b/metrics/config.go
index 829905a2e..0b61809b9 100644
--- a/metrics/config.go
+++ b/metrics/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/metrics/event_controller.go b/metrics/event_controller.go
index 901055f02..b83501720 100644
--- a/metrics/event_controller.go
+++ b/metrics/event_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/metrics/histogram.go b/metrics/histogram.go
index 33674e3b5..f5ccb9735 100644
--- a/metrics/histogram.go
+++ b/metrics/histogram.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/metrics/influxdb_reporter.go b/metrics/influxdb_reporter.go
index 368c2d76d..7bb39558f 100644
--- a/metrics/influxdb_reporter.go
+++ b/metrics/influxdb_reporter.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/metrics/interval_counter.go b/metrics/interval_counter.go
index cf99c1162..3d47b8ea1 100644
--- a/metrics/interval_counter.go
+++ b/metrics/interval_counter.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/metrics/interval_counter_test.go b/metrics/interval_counter_test.go
index a1a6d2dbc..951e72959 100644
--- a/metrics/interval_counter_test.go
+++ b/metrics/interval_counter_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/metrics/latency.go b/metrics/latency.go
index 3fd9742b7..b39fe1b57 100644
--- a/metrics/latency.go
+++ b/metrics/latency.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/metrics/meter.go b/metrics/meter.go
index 7a4749504..6b483a1e6 100644
--- a/metrics/meter.go
+++ b/metrics/meter.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/metrics/metrics_msg_builder.go b/metrics/metrics_msg_builder.go
index c62c991d7..de1619c08 100644
--- a/metrics/metrics_msg_builder.go
+++ b/metrics/metrics_msg_builder.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/metrics/peekhandler.go b/metrics/peekhandler.go
index 9c0477634..3f8ff095c 100644
--- a/metrics/peekhandler.go
+++ b/metrics/peekhandler.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/metrics/registry.go b/metrics/registry.go
index bf12669ed..754a12851 100644
--- a/metrics/registry.go
+++ b/metrics/registry.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/pb/ctrl_pb/ctrl.pb.go b/pb/ctrl_pb/ctrl.pb.go
index db08ea2d1..23cd17d93 100644
--- a/pb/ctrl_pb/ctrl.pb.go
+++ b/pb/ctrl_pb/ctrl.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/pb/ctrl_pb/decoder.go b/pb/ctrl_pb/decoder.go
index c2fb9cac4..0a68d3e5f 100644
--- a/pb/ctrl_pb/decoder.go
+++ b/pb/ctrl_pb/decoder.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/pb/ctrl_pb/inspect.go b/pb/ctrl_pb/inspect.go
index 1e4ac28dd..b68fa2dc1 100644
--- a/pb/ctrl_pb/inspect.go
+++ b/pb/ctrl_pb/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/pb/mgmt_pb/decoder.go b/pb/mgmt_pb/decoder.go
index 449de8696..e239633d5 100644
--- a/pb/mgmt_pb/decoder.go
+++ b/pb/mgmt_pb/decoder.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/pb/mgmt_pb/mgmt.pb.go b/pb/mgmt_pb/mgmt.pb.go
index 5b1b09c31..d70f97bd6 100644
--- a/pb/mgmt_pb/mgmt.pb.go
+++ b/pb/mgmt_pb/mgmt.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/router/config.go b/router/config.go
index 7c11297c9..99e86da5c 100644
--- a/router/config.go
+++ b/router/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/router/forwarder/forwarder.go b/router/forwarder/forwarder.go
index 777271fcd..1eccb9435 100644
--- a/router/forwarder/forwarder.go
+++ b/router/forwarder/forwarder.go
@@ -1,5 +1,5 @@
 /*
-	Copyright 2019 Netfoundry, Inc.
+	Copyright 2019 NetFoundry, Inc.
 
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.
diff --git a/router/forwarder/link.go b/router/forwarder/link.go
index 41366deff..d37a18c79 100644
--- a/router/forwarder/link.go
+++ b/router/forwarder/link.go
@@ -1,5 +1,5 @@
 /*
-	Copyright 2019 Netfoundry, Inc.
+	Copyright 2019 NetFoundry, Inc.
 
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.
diff --git a/router/forwarder/options.go b/router/forwarder/options.go
index 1faa3dabf..9756a4da1 100644
--- a/router/forwarder/options.go
+++ b/router/forwarder/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/router/forwarder/tables.go b/router/forwarder/tables.go
index d1c188be6..d9e72f7d3 100644
--- a/router/forwarder/tables.go
+++ b/router/forwarder/tables.go
@@ -1,5 +1,5 @@
 /*
-	Copyright 2019 Netfoundry, Inc.
+	Copyright 2019 NetFoundry, Inc.
 
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.
diff --git a/router/handler_ctrl/bind.go b/router/handler_ctrl/bind.go
index 80456f025..dc842e36c 100644
--- a/router/handler_ctrl/bind.go
+++ b/router/handler_ctrl/bind.go
@@ -1,5 +1,5 @@
 /*
-	Copyright 2019 Netfoundry, Inc.
+	Copyright 2019 NetFoundry, Inc.
 
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.
diff --git a/router/handler_ctrl/dial.go b/router/handler_ctrl/dial.go
index 3855ee59f..7dce6e71a 100644
--- a/router/handler_ctrl/dial.go
+++ b/router/handler_ctrl/dial.go
@@ -1,5 +1,5 @@
 /*
-	Copyright 2019 Netfoundry, Inc.
+	Copyright 2019 NetFoundry, Inc.
 
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.
diff --git a/router/handler_ctrl/inspect.go b/router/handler_ctrl/inspect.go
index 622896e7e..1bcedf5a9 100644
--- a/router/handler_ctrl/inspect.go
+++ b/router/handler_ctrl/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/router/handler_ctrl/route.go b/router/handler_ctrl/route.go
index ed3e98a72..1790ae674 100644
--- a/router/handler_ctrl/route.go
+++ b/router/handler_ctrl/route.go
@@ -1,5 +1,5 @@
 /*
-	Copyright 2019 Netfoundry, Inc.
+	Copyright 2019 NetFoundry, Inc.
 
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.
diff --git a/router/handler_ctrl/start_xgress.go b/router/handler_ctrl/start_xgress.go
index 6cc6b27c6..a64af7694 100644
--- a/router/handler_ctrl/start_xgress.go
+++ b/router/handler_ctrl/start_xgress.go
@@ -1,5 +1,5 @@
 /*
-	Copyright 2019 Netfoundry, Inc.
+	Copyright 2019 NetFoundry, Inc.
 
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.
diff --git a/router/handler_ctrl/toggle_pipe_traces.go b/router/handler_ctrl/toggle_pipe_traces.go
index 6f06ef64c..6607d004b 100644
--- a/router/handler_ctrl/toggle_pipe_traces.go
+++ b/router/handler_ctrl/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/router/handler_ctrl/unroute.go b/router/handler_ctrl/unroute.go
index 6e9f44c87..03ab276b4 100644
--- a/router/handler_ctrl/unroute.go
+++ b/router/handler_ctrl/unroute.go
@@ -1,5 +1,5 @@
 /*
-	Copyright 2019 Netfoundry, Inc.
+	Copyright 2019 NetFoundry, Inc.
 
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.
diff --git a/router/handler_link/accept.go b/router/handler_link/accept.go
index 323cce389..1a6c8ad80 100644
--- a/router/handler_link/accept.go
+++ b/router/handler_link/accept.go
@@ -1,5 +1,5 @@
 /*
-	Copyright 2019 Netfoundry, Inc.
+	Copyright 2019 NetFoundry, Inc.
 
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.
diff --git a/router/handler_link/ack.go b/router/handler_link/ack.go
index 3b5bb7638..2a71f00ed 100644
--- a/router/handler_link/ack.go
+++ b/router/handler_link/ack.go
@@ -1,5 +1,5 @@
 /*
-	Copyright 2019 Netfoundry, Inc.
+	Copyright 2019 NetFoundry, Inc.
 
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.
diff --git a/router/handler_link/bind.go b/router/handler_link/bind.go
index b909d70be..6a9621022 100644
--- a/router/handler_link/bind.go
+++ b/router/handler_link/bind.go
@@ -1,5 +1,5 @@
 /*
-	Copyright 2019 Netfoundry, Inc.
+	Copyright 2019 NetFoundry, Inc.
 
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.
diff --git a/router/handler_link/close.go b/router/handler_link/close.go
index 94806d338..c6ac0fd8d 100644
--- a/router/handler_link/close.go
+++ b/router/handler_link/close.go
@@ -1,5 +1,5 @@
 /*
-	Copyright 2019 Netfoundry, Inc.
+	Copyright 2019 NetFoundry, Inc.
 
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.
diff --git a/router/handler_link/error.go b/router/handler_link/error.go
index f4dd4aacb..459278cc5 100644
--- a/router/handler_link/error.go
+++ b/router/handler_link/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/router/handler_link/payload.go b/router/handler_link/payload.go
index d471083a1..7d73944e9 100644
--- a/router/handler_link/payload.go
+++ b/router/handler_link/payload.go
@@ -1,5 +1,5 @@
 /*
-	Copyright 2019 Netfoundry, Inc.
+	Copyright 2019 NetFoundry, Inc.
 
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.
diff --git a/router/handler_xgress/bind.go b/router/handler_xgress/bind.go
index 0d46c28f7..8711f16a2 100644
--- a/router/handler_xgress/bind.go
+++ b/router/handler_xgress/bind.go
@@ -1,5 +1,5 @@
 /*
-	Copyright 2019 Netfoundry, Inc.
+	Copyright 2019 NetFoundry, Inc.
 
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.
diff --git a/router/handler_xgress/close.go b/router/handler_xgress/close.go
index c5420247b..23986db82 100644
--- a/router/handler_xgress/close.go
+++ b/router/handler_xgress/close.go
@@ -1,5 +1,5 @@
 /*
-	Copyright 2019 Netfoundry, Inc.
+	Copyright 2019 NetFoundry, Inc.
 
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.
diff --git a/router/handler_xgress/receive.go b/router/handler_xgress/receive.go
index ad10e4922..84aee031b 100644
--- a/router/handler_xgress/receive.go
+++ b/router/handler_xgress/receive.go
@@ -1,5 +1,5 @@
 /*
-	Copyright 2019 Netfoundry, Inc.
+	Copyright 2019 NetFoundry, Inc.
 
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.
diff --git a/router/monitor.go b/router/monitor.go
index d2bdcc24a..1bab4f061 100644
--- a/router/monitor.go
+++ b/router/monitor.go
@@ -1,5 +1,5 @@
 /*
-	Copyright 2019 Netfoundry, Inc.
+	Copyright 2019 NetFoundry, Inc.
 
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.
diff --git a/router/monitor_darwin.go b/router/monitor_darwin.go
index 92e89c78c..0eda58d1f 100644
--- a/router/monitor_darwin.go
+++ b/router/monitor_darwin.go
@@ -1,5 +1,5 @@
 /*
-	Copyright 2019 Netfoundry, Inc.
+	Copyright 2019 NetFoundry, Inc.
 
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.
diff --git a/router/monitor_linux.go b/router/monitor_linux.go
index 92e89c78c..0eda58d1f 100644
--- a/router/monitor_linux.go
+++ b/router/monitor_linux.go
@@ -1,5 +1,5 @@
 /*
-	Copyright 2019 Netfoundry, Inc.
+	Copyright 2019 NetFoundry, Inc.
 
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.
diff --git a/router/monitor_windows.go b/router/monitor_windows.go
index 6514e306f..099edbdb0 100644
--- a/router/monitor_windows.go
+++ b/router/monitor_windows.go
@@ -1,5 +1,5 @@
 /*
-	Copyright 2019 Netfoundry, Inc.
+	Copyright 2019 NetFoundry, Inc.
 
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.
diff --git a/router/router.go b/router/router.go
index 8df644a84..d333ae3ff 100644
--- a/router/router.go
+++ b/router/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/trace/channel_peekhandler.go b/trace/channel_peekhandler.go
index 4d95926e0..be04e7d4d 100644
--- a/trace/channel_peekhandler.go
+++ b/trace/channel_peekhandler.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/trace/controller.go b/trace/controller.go
index 98b5cbe68..7b6c672cb 100644
--- a/trace/controller.go
+++ b/trace/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/trace/event_controller.go b/trace/event_controller.go
index c68be9071..fbe4a4d44 100644
--- a/trace/event_controller.go
+++ b/trace/event_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/trace/filter.go b/trace/filter.go
index 26da6199f..87b4f2248 100644
--- a/trace/filter.go
+++ b/trace/filter.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/trace/xgress_peekhandler.go b/trace/xgress_peekhandler.go
index c0fb2de9e..9291328a0 100644
--- a/trace/xgress_peekhandler.go
+++ b/trace/xgress_peekhandler.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/xctrl/ops.go b/xctrl/ops.go
index 5820b7816..9b5deb3d9 100644
--- a/xctrl/ops.go
+++ b/xctrl/ops.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/xctrl/xctrl.go b/xctrl/xctrl.go
index 0f7c54d86..17ee87feb 100644
--- a/xctrl/xctrl.go
+++ b/xctrl/xctrl.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/xctrl_example/example.go b/xctrl_example/example.go
index b5ac70670..dbe44827c 100644
--- a/xctrl_example/example.go
+++ b/xctrl_example/example.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/xctrl_example/receive.go b/xctrl_example/receive.go
index 50d034f05..1552a97b9 100644
--- a/xctrl_example/receive.go
+++ b/xctrl_example/receive.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/xgress/ctrl.go b/xgress/ctrl.go
index c64a45f16..b5ab79fd4 100644
--- a/xgress/ctrl.go
+++ b/xgress/ctrl.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/xgress/decoder.go b/xgress/decoder.go
index 2a8d2f4e7..9f0569328 100644
--- a/xgress/decoder.go
+++ b/xgress/decoder.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/xgress/messages.go b/xgress/messages.go
index 23b9ce1da..7fbd0c9dd 100644
--- a/xgress/messages.go
+++ b/xgress/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/xgress/messages_test.go b/xgress/messages_test.go
index 129c40fc7..8b7195533 100644
--- a/xgress/messages_test.go
+++ b/xgress/messages_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/xgress/options.go b/xgress/options.go
index 3ae7c6c1b..c4f84ac45 100644
--- a/xgress/options.go
+++ b/xgress/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/xgress/payload_buffer.go b/xgress/payload_buffer.go
index 5dfa94d89..678bf4b09 100644
--- a/xgress/payload_buffer.go
+++ b/xgress/payload_buffer.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/xgress/registry.go b/xgress/registry.go
index 9d1463c92..2325b5cb3 100644
--- a/xgress/registry.go
+++ b/xgress/registry.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/xgress/request.go b/xgress/request.go
index 22af22c28..9e2c01abd 100644
--- a/xgress/request.go
+++ b/xgress/request.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/xgress/transmit_buffer.go b/xgress/transmit_buffer.go
index a78c6fabb..22a823d50 100644
--- a/xgress/transmit_buffer.go
+++ b/xgress/transmit_buffer.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/xgress/xgress.go b/xgress/xgress.go
index 15097ba5b..c25132065 100644
--- a/xgress/xgress.go
+++ b/xgress/xgress.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/xgress_proxy/connection.go b/xgress_proxy/connection.go
index 38c74a3ca..ad04b1e16 100644
--- a/xgress_proxy/connection.go
+++ b/xgress_proxy/connection.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/xgress_proxy/factory.go b/xgress_proxy/factory.go
index 1a74d71fe..7fb8ed276 100644
--- a/xgress_proxy/factory.go
+++ b/xgress_proxy/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/xgress_proxy/listener.go b/xgress_proxy/listener.go
index 4e597d268..7bfb7a78e 100644
--- a/xgress_proxy/listener.go
+++ b/xgress_proxy/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/xgress_transport/client.go b/xgress_transport/client.go
index c7e0d5505..c659e94cc 100644
--- a/xgress_transport/client.go
+++ b/xgress_transport/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/xgress_transport/connection.go b/xgress_transport/connection.go
index 1436d15a6..1096727d3 100644
--- a/xgress_transport/connection.go
+++ b/xgress_transport/connection.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/xgress_transport/dialer.go b/xgress_transport/dialer.go
index e53161aaf..77f75b4c5 100644
--- a/xgress_transport/dialer.go
+++ b/xgress_transport/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/xgress_transport/factory.go b/xgress_transport/factory.go
index 3fa82aa62..f4973bb1b 100644
--- a/xgress_transport/factory.go
+++ b/xgress_transport/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/xgress_transport/listener.go b/xgress_transport/listener.go
index 8fd64b2f6..6098837f0 100644
--- a/xgress_transport/listener.go
+++ b/xgress_transport/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/xgress_udp/address.go b/xgress_udp/address.go
index 287960182..cae49c93f 100644
--- a/xgress_udp/address.go
+++ b/xgress_udp/address.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/xgress_udp/connection.go b/xgress_udp/connection.go
index 20ea85979..552ab9fb4 100644
--- a/xgress_udp/connection.go
+++ b/xgress_udp/connection.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/xgress_udp/dialer.go b/xgress_udp/dialer.go
index 9da1ea77d..039e8314f 100644
--- a/xgress_udp/dialer.go
+++ b/xgress_udp/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/xgress_udp/factory.go b/xgress_udp/factory.go
index 61e274d95..a4ab68759 100644
--- a/xgress_udp/factory.go
+++ b/xgress_udp/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/xgress_udp/listener.go b/xgress_udp/listener.go
index e58c688c3..43f9b7965 100644
--- a/xgress_udp/listener.go
+++ b/xgress_udp/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.
@@ -58,13 +58,13 @@ func (listener *listener) Listen(address string, bindHandler xgress.BindHandler)
 	listener.address = address
 	listener.bindHandler = bindHandler
 
-	pfxlog.Logger().Infof("Parsing xgress address: %v", address)
+	pfxlog.Logger().Infof("parsing xgress address: %v", address)
 	packetAddress, err := parseAddress(address)
 	if err != nil {
 		return fmt.Errorf("cannot listen on invalid address [%s] (%s)", address, err)
 	}
 
-	pfxlog.Logger().Infof("Dialing packet address %v", packetAddress)
+	pfxlog.Logger().Infof("dialing packet address %v", packetAddress)
 	conn, err := net.ListenPacket(packetAddress.Network(), packetAddress.Address())
 	if err != nil {
 		return err
@@ -120,7 +120,7 @@ func (listener *listener) rx() {
 	for {
 		select {
 		case data := <-listener.dataChan:
-			logger.Debugf("Handling data. Bytes %v from source %v", len(data.buffer), data.source)
+			logger.Debugf("handling data. bytes %v from source %v", len(data.buffer), data.source)
 			sessionId := data.source.String()
 			session, present := listener.sessions[sessionId]
 			if !present {
@@ -133,16 +133,19 @@ func (listener *listener) rx() {
 				}
 				session.MarkActivity()
 				listener.sessions[sessionId] = session
-				logger.Debugf("No session present. Authenticating session for %v", data.source)
+				logger.Debugf("no session present. authenticating session for %v", data.source)
 				go listener.handleConnect(data.buffer, session)
+
 			} else if session.sessionState == sessionStateEstablished {
-				logger.Debugf("Session established for %v, forwarding data", data.source)
+				logger.Debugf("session established for %v, forwarding data", data.source)
 				session.MarkActivity()
 				session.readC <- data.buffer
-				logger.Debugf("Session established for %v. Data forwarded", data.source)
+				logger.Debugf("session established for %v. Data forwarded", data.source)
 			}
+
 		case event := <-listener.eventChan:
 			event.handle(listener)
+
 		case tick := <-sessionScanTimer:
 			nowNanos := tick.UnixNano()
 			for _, session := range listener.sessions {
diff --git a/xmgmt/xmgmt.go b/xmgmt/xmgmt.go
index dcb88c8a7..18c98d910 100644
--- a/xmgmt/xmgmt.go
+++ b/xmgmt/xmgmt.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.