diff --git a/go.mod b/go.mod
index b9c79b6413628b85d90c2b44cf84790b7fd04bf2_Z28ubW9k..847537d7ade0a5afa9c8081159eccf962352dee3_Z28ubW9k 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module orus.io/orus-io/go-orus-api
+module orus.io/orus-io/go-orusapi
 
 go 1.14
 
diff --git a/log-console-writer_test.go b/log-console-writer_test.go
index b9c79b6413628b85d90c2b44cf84790b7fd04bf2_bG9nLWNvbnNvbGUtd3JpdGVyX3Rlc3QuZ28=..847537d7ade0a5afa9c8081159eccf962352dee3_bG9nLWNvbnNvbGUtd3JpdGVyX3Rlc3QuZ28= 100644
--- a/log-console-writer_test.go
+++ b/log-console-writer_test.go
@@ -327,7 +327,7 @@
 		wd, err := os.Getwd()
 		assert.NoError(t, err)
 		expectedOutput := fmt.Sprintf(`<nil> ERR Foobar exception=error!(any)
-orus.io/orus-io/go-orus-api.TestConsoleWriter.func13
+orus.io/orus-io/go-orusapi.TestConsoleWriter.func13
     %s/log-console-writer_test.go:313
 
 `, wd)
diff --git a/templates/server/cmd.gotmpl b/templates/server/cmd.gotmpl
index b9c79b6413628b85d90c2b44cf84790b7fd04bf2_dGVtcGxhdGVzL3NlcnZlci9jbWQuZ290bXBs..847537d7ade0a5afa9c8081159eccf962352dee3_dGVtcGxhdGVzL3NlcnZlci9jbWQuZ290bXBs 100644
--- a/templates/server/cmd.gotmpl
+++ b/templates/server/cmd.gotmpl
@@ -1,6 +1,6 @@
-// Code generated by go-swagger/go-orus-api; DO NOT EDIT.
+// Code generated by go-swagger/go-orusapi; DO NOT EDIT.
 
 package cmd
 
 import (
 	"github.com/orus-io/go-flags"
@@ -2,10 +2,10 @@
 
 package cmd
 
 import (
 	"github.com/orus-io/go-flags"
-	orusapi "orus.io/orus-io/go-orus-api"
-	"orus.io/orus-io/go-orus-api/database"
+	"orus.io/orus-io/go-orusapi"
+	"orus.io/orus-io/go-orusapi/database"
 )
 
 type ConfigFile struct {
diff --git a/templates/server/cmdMigrate.gotmpl b/templates/server/cmdMigrate.gotmpl
index b9c79b6413628b85d90c2b44cf84790b7fd04bf2_dGVtcGxhdGVzL3NlcnZlci9jbWRNaWdyYXRlLmdvdG1wbA==..847537d7ade0a5afa9c8081159eccf962352dee3_dGVtcGxhdGVzL3NlcnZlci9jbWRNaWdyYXRlLmdvdG1wbA== 100644
--- a/templates/server/cmdMigrate.gotmpl
+++ b/templates/server/cmdMigrate.gotmpl
@@ -1,5 +1,5 @@
-// Code generated by go-swagger/go-orus-api; DO NOT EDIT.
+// Code generated by go-swagger/go-orusapi; DO NOT EDIT.
 
 package cmd
 
 import (
@@ -2,8 +2,8 @@
 
 package cmd
 
 import (
-	"orus.io/orus-io/go-orus-api/database"
+	"orus.io/orus-io/go-orusapi/database"
 	"github.com/golang-migrate/migrate/v4/source"
 	bindata "github.com/golang-migrate/migrate/v4/source/go_bindata"
 
diff --git a/templates/server/cmdServe.gotmpl b/templates/server/cmdServe.gotmpl
index b9c79b6413628b85d90c2b44cf84790b7fd04bf2_dGVtcGxhdGVzL3NlcnZlci9jbWRTZXJ2ZS5nb3RtcGw=..847537d7ade0a5afa9c8081159eccf962352dee3_dGVtcGxhdGVzL3NlcnZlci9jbWRTZXJ2ZS5nb3RtcGw= 100644
--- a/templates/server/cmdServe.gotmpl
+++ b/templates/server/cmdServe.gotmpl
@@ -1,4 +1,4 @@
-// Code generated by go-swagger/go-orus-api; DO NOT EDIT.
+// Code generated by go-swagger/go-orusapi; DO NOT EDIT.
 
 package cmd
 
@@ -8,7 +8,7 @@
 	"github.com/jmoiron/sqlx"
 	flags "github.com/orus-io/go-flags"
 	"github.com/prometheus/client_golang/prometheus"
-	"orus.io/orus-io/go-orus-api/database"
+	"orus.io/orus-io/go-orusapi/database"
 	"{{ joinFilePath .TargetImportPath "restapi" "operations" }}"
 )
 
diff --git a/templates/server/main.gotmpl b/templates/server/main.gotmpl
index b9c79b6413628b85d90c2b44cf84790b7fd04bf2_dGVtcGxhdGVzL3NlcnZlci9tYWluLmdvdG1wbA==..847537d7ade0a5afa9c8081159eccf962352dee3_dGVtcGxhdGVzL3NlcnZlci9tYWluLmdvdG1wbA== 100644
--- a/templates/server/main.gotmpl
+++ b/templates/server/main.gotmpl
@@ -1,4 +1,4 @@
-// Code generated by go-swagger with a go-orus-api template; DO NOT EDIT.
+// Code generated by go-swagger with a go-orusapi template; DO NOT EDIT.
 
 package main
 
diff --git a/templates/server/migration.gotmpl b/templates/server/migration.gotmpl
index b9c79b6413628b85d90c2b44cf84790b7fd04bf2_dGVtcGxhdGVzL3NlcnZlci9taWdyYXRpb24uZ290bXBs..847537d7ade0a5afa9c8081159eccf962352dee3_dGVtcGxhdGVzL3NlcnZlci9taWdyYXRpb24uZ290bXBs 100644
--- a/templates/server/migration.gotmpl
+++ b/templates/server/migration.gotmpl
@@ -1,4 +1,4 @@
-// Code generated by go-swagger/go-orus-api; DO NOT EDIT.
+// Code generated by go-swagger/go-orusapi; DO NOT EDIT.
 
 package migration