diff --git a/server/server_context.go b/server/server_context.go
index b5d930b..a00a64b 100644
--- a/server/server_context.go
+++ b/server/server_context.go
@@ -12,7 +12,7 @@ type serverContext struct {
 	cwf.ServerContext
 }
 
-func NewServerContext(serverCTX cwf.ServerContext) ServerContext {
+func newServerContext(serverCTX cwf.ServerContext) ServerContext {
 	sCTX := &serverContext{}
 	sCTX.ServerContext = serverCTX
 
diff --git a/server/server_handlers.go b/server/server_handlers.go
index 710dea2..5e0b6b9 100644
--- a/server/server_handlers.go
+++ b/server/server_handlers.go
@@ -44,7 +44,7 @@ type ServerHandlers struct {
 	subscribers     []oos.SubscriberHandler
 }
 
-func (sh *ServerHandlers) ServerContext() ServerContext {
+func (sh *ServerHandlers) ServerContext() cwf.ServerContext {
 	serverCTX := sh.ServerHandlers.ServerContext()
 
 	return newServerContext(serverCTX)