diff --git a/codegen/templates/http_routes.tpl b/codegen/templates/http_routes.tpl
index 3f3d2839c..aa238664b 100644
--- a/codegen/templates/http_routes.tpl
+++ b/codegen/templates/http_routes.tpl
@@ -13,7 +13,7 @@ import (
 
 func MountRoutes(r chi.Router) {
 {foreach $apis as $api}
-	{api.interface|strtolower} := &server.{api.interface|capitalize}Handlers{{api.interface|capitalize}{ldelim}{rdelim}.New()}
+	{api.interface|strtolower} := &server.{api.interface|capitalize}Handlers{{api.interface|capitalize}:{api.interface|capitalize}{ldelim}{rdelim}.New()}
 {/foreach}
 {foreach $apis as $api}
 	r.Group(func (r chi.Router) {
@@ -41,4 +41,4 @@ func MountRoutes(r chi.Router) {
 		}
 	}
 	printRoutes(r, "", "")
-}
\ No newline at end of file
+}
diff --git a/crm/rest/router.go b/crm/rest/router.go
index 4a20963f7..e42884996 100644
--- a/crm/rest/router.go
+++ b/crm/rest/router.go
@@ -25,8 +25,8 @@ import (
 )
 
 func MountRoutes(r chi.Router) {
-	field := &server.FieldHandlers{Field{}.New()}
-	module := &server.ModuleHandlers{Module{}.New()}
+	field := &server.FieldHandlers{Field: Field{}.New()}
+	module := &server.ModuleHandlers{Module: Module{}.New()}
 	r.Group(func(r chi.Router) {
 		r.Use(field.Field.Authenticator())
 		r.Route("/field", func(r chi.Router) {
diff --git a/sam/rest/router.go b/sam/rest/router.go
index 1353f68df..06366c2f8 100644
--- a/sam/rest/router.go
+++ b/sam/rest/router.go
@@ -25,12 +25,12 @@ import (
 )
 
 func MountRoutes(r chi.Router) {
-	channel := &server.ChannelHandlers{Channel{}.New()}
-	message := &server.MessageHandlers{Message{}.New()}
-	organisation := &server.OrganisationHandlers{Organisation{}.New()}
-	team := &server.TeamHandlers{Team{}.New()}
-	user := &server.UserHandlers{User{}.New()}
-	websocket := &server.WebsocketHandlers{Websocket{}.New()}
+	channel := &server.ChannelHandlers{Channel: Channel{}.New()}
+	message := &server.MessageHandlers{Message: Message{}.New()}
+	organisation := &server.OrganisationHandlers{Organisation: Organisation{}.New()}
+	team := &server.TeamHandlers{Team: Team{}.New()}
+	user := &server.UserHandlers{User: User{}.New()}
+	websocket := &server.WebsocketHandlers{Websocket: Websocket{}.New()}
 	r.Group(func(r chi.Router) {
 		r.Use(channel.Channel.Authenticator())
 		r.Route("/channel", func(r chi.Router) {