diff --git a/cmd/main.go b/cmd/main.go
index 1f494cc..4b671f5 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -46,8 +46,8 @@ func main() {
 	e.Use(middleware.RateLimiter(middleware.NewRateLimiterMemoryStore(20)))
 
 	e.POST("/auth", controllers.AuthController{}.Auth)
-	e.POST("/create", controllers.CreateUserRouter{}.CreateUser)
-	e.POST("/addinvoice", controllers.AddInvoiceRouter{}.AddInvoice, middleware.JWT([]byte("secret")))
+	e.POST("/create", controllers.CreateUserController{}.CreateUser)
+	e.POST("/addinvoice", controllers.AddInvoiceController{}.AddInvoice, middleware.JWT([]byte("secret")))
 
 	// Start server
 	go func() {
diff --git a/pkg/controllers/addinvoice.ctrl.go b/pkg/controllers/addinvoice.ctrl.go
index 2a8b923..1a55bf6 100644
--- a/pkg/controllers/addinvoice.ctrl.go
+++ b/pkg/controllers/addinvoice.ctrl.go
@@ -12,11 +12,11 @@ import (
 	"github.com/bumi/lndhub.go/pkg/database/models"
 )
 
-// AddInvoiceRouter : Add invoice router struct
-type AddInvoiceRouter struct{}
+// AddInvoiceController : Add invoice controller struct
+type AddInvoiceController struct{}
 
-// AddInvoice : Add invoice Router
-func (AddInvoiceRouter) AddInvoice(c echo.Context) error {
+// AddInvoice : Add invoice Controller
+func (AddInvoiceController) AddInvoice(c echo.Context) error {
 	user := c.Get("user").(*jwt.Token)
 	claims := user.Claims.(jwt.MapClaims)
 	userID := claims["id"].(float64)
diff --git a/pkg/controllers/auth.ctrl.go b/pkg/controllers/auth.ctrl.go
index 0833a13..57147c8 100644
--- a/pkg/controllers/auth.ctrl.go
+++ b/pkg/controllers/auth.ctrl.go
@@ -13,7 +13,7 @@ import (
 // AuthController : AuthController struct
 type AuthController struct{}
 
-// Auth : Auth Router
+// Auth : Auth Controller
 func (AuthController) Auth(c echo.Context) error {
 	type RequestBody struct {
 		Login        string `json:"login"`
diff --git a/pkg/controllers/create.ctrl.go b/pkg/controllers/create.ctrl.go
index e69bd62..4afd0f5 100644
--- a/pkg/controllers/create.ctrl.go
+++ b/pkg/controllers/create.ctrl.go
@@ -13,11 +13,11 @@ import (
 
 const alphaNumBytes = random.Alphanumeric
 
-// CreateUserRouter : Create user router struct
-type CreateUserRouter struct{}
+// CreateUserController : Create user controller struct
+type CreateUserController struct{}
 
-// CreateUser : Create user Router
-func (CreateUserRouter) CreateUser(c echo.Context) error {
+// CreateUser : Create user Controller
+func (CreateUserController) CreateUser(c echo.Context) error {
 	type RequestBody struct {
 		PartnerID   string `json:"partnerid"`
 		AccountType string `json:"accounttype"`