diff --git a/pkg/space/mocks/Spaces.go b/pkg/spaces/mocks/Spaces.go
similarity index 70%
rename from pkg/space/mocks/Spaces.go
rename to pkg/spaces/mocks/Spaces.go
index 6fd9ef4aaf8012c82973ed3d94815babed9acd65..e272ebceb87c26a672a3aaf5f7dde3dd4858991e 100644
--- a/pkg/space/mocks/Spaces.go
+++ b/pkg/spaces/mocks/Spaces.go
@@ -5,7 +5,7 @@ package mocks
 import (
 	context "context"
 
-	space "git.perx.ru/perxis/perxis-go/pkg/space"
+	spaces "git.perx.ru/perxis/perxis-go/pkg/spaces"
 	mock "github.com/stretchr/testify/mock"
 )
 
@@ -15,23 +15,23 @@ type Spaces struct {
 }
 
 // Create provides a mock function with given fields: ctx, _a1
-func (_m *Spaces) Create(ctx context.Context, _a1 *space.Space) (*space.Space, error) {
+func (_m *Spaces) Create(ctx context.Context, _a1 *spaces.Space) (*spaces.Space, error) {
 	ret := _m.Called(ctx, _a1)
 
-	var r0 *space.Space
+	var r0 *spaces.Space
 	var r1 error
-	if rf, ok := ret.Get(0).(func(context.Context, *space.Space) (*space.Space, error)); ok {
+	if rf, ok := ret.Get(0).(func(context.Context, *spaces.Space) (*spaces.Space, error)); ok {
 		return rf(ctx, _a1)
 	}
-	if rf, ok := ret.Get(0).(func(context.Context, *space.Space) *space.Space); ok {
+	if rf, ok := ret.Get(0).(func(context.Context, *spaces.Space) *spaces.Space); ok {
 		r0 = rf(ctx, _a1)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*space.Space)
+			r0 = ret.Get(0).(*spaces.Space)
 		}
 	}
 
-	if rf, ok := ret.Get(1).(func(context.Context, *space.Space) error); ok {
+	if rf, ok := ret.Get(1).(func(context.Context, *spaces.Space) error); ok {
 		r1 = rf(ctx, _a1)
 	} else {
 		r1 = ret.Error(1)
@@ -55,19 +55,19 @@ func (_m *Spaces) Delete(ctx context.Context, spaceId string) error {
 }
 
 // Get provides a mock function with given fields: ctx, spaceId
-func (_m *Spaces) Get(ctx context.Context, spaceId string) (*space.Space, error) {
+func (_m *Spaces) Get(ctx context.Context, spaceId string) (*spaces.Space, error) {
 	ret := _m.Called(ctx, spaceId)
 
-	var r0 *space.Space
+	var r0 *spaces.Space
 	var r1 error
-	if rf, ok := ret.Get(0).(func(context.Context, string) (*space.Space, error)); ok {
+	if rf, ok := ret.Get(0).(func(context.Context, string) (*spaces.Space, error)); ok {
 		return rf(ctx, spaceId)
 	}
-	if rf, ok := ret.Get(0).(func(context.Context, string) *space.Space); ok {
+	if rf, ok := ret.Get(0).(func(context.Context, string) *spaces.Space); ok {
 		r0 = rf(ctx, spaceId)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*space.Space)
+			r0 = ret.Get(0).(*spaces.Space)
 		}
 	}
 
@@ -81,19 +81,19 @@ func (_m *Spaces) Get(ctx context.Context, spaceId string) (*space.Space, error)
 }
 
 // List provides a mock function with given fields: ctx, orgId
-func (_m *Spaces) List(ctx context.Context, orgId string) ([]*space.Space, error) {
+func (_m *Spaces) List(ctx context.Context, orgId string) ([]*spaces.Space, error) {
 	ret := _m.Called(ctx, orgId)
 
-	var r0 []*space.Space
+	var r0 []*spaces.Space
 	var r1 error
-	if rf, ok := ret.Get(0).(func(context.Context, string) ([]*space.Space, error)); ok {
+	if rf, ok := ret.Get(0).(func(context.Context, string) ([]*spaces.Space, error)); ok {
 		return rf(ctx, orgId)
 	}
-	if rf, ok := ret.Get(0).(func(context.Context, string) []*space.Space); ok {
+	if rf, ok := ret.Get(0).(func(context.Context, string) []*spaces.Space); ok {
 		r0 = rf(ctx, orgId)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).([]*space.Space)
+			r0 = ret.Get(0).([]*spaces.Space)
 		}
 	}
 
@@ -107,11 +107,11 @@ func (_m *Spaces) List(ctx context.Context, orgId string) ([]*space.Space, error
 }
 
 // Update provides a mock function with given fields: ctx, _a1
-func (_m *Spaces) Update(ctx context.Context, _a1 *space.Space) error {
+func (_m *Spaces) Update(ctx context.Context, _a1 *spaces.Space) error {
 	ret := _m.Called(ctx, _a1)
 
 	var r0 error
-	if rf, ok := ret.Get(0).(func(context.Context, *space.Space) error); ok {
+	if rf, ok := ret.Get(0).(func(context.Context, *spaces.Space) error); ok {
 		r0 = rf(ctx, _a1)
 	} else {
 		r0 = ret.Error(0)
@@ -121,11 +121,11 @@ func (_m *Spaces) Update(ctx context.Context, _a1 *space.Space) error {
 }
 
 // UpdateConfig provides a mock function with given fields: ctx, spaceId, config
-func (_m *Spaces) UpdateConfig(ctx context.Context, spaceId string, config *space.Config) error {
+func (_m *Spaces) UpdateConfig(ctx context.Context, spaceId string, config *spaces.Config) error {
 	ret := _m.Called(ctx, spaceId, config)
 
 	var r0 error
-	if rf, ok := ret.Get(0).(func(context.Context, string, *space.Config) error); ok {
+	if rf, ok := ret.Get(0).(func(context.Context, string, *spaces.Config) error); ok {
 		r0 = rf(ctx, spaceId, config)
 	} else {
 		r0 = ret.Error(0)
diff --git a/pkg/space/service.go b/pkg/spaces/service.go
similarity index 99%
rename from pkg/space/service.go
rename to pkg/spaces/service.go
index 576f5c2f8a7fae3a2b15d658eb1f42b5df0cab51..d31cbfebec963d6b48ee618bfc7af85236b6aed3 100644
--- a/pkg/space/service.go
+++ b/pkg/spaces/service.go
@@ -1,4 +1,4 @@
-package space
+package spaces
 
 import (
 	"context"
diff --git a/pkg/space/space.go b/pkg/spaces/space.go
similarity index 99%
rename from pkg/space/space.go
rename to pkg/spaces/space.go
index dad51255a6fa9e8e648eec346a92f45c1749c876..772caa9cb248d555551de5096eb75c6ebd5e66a4 100644
--- a/pkg/space/space.go
+++ b/pkg/spaces/space.go
@@ -1,4 +1,4 @@
-package space
+package spaces
 
 type State int
 
diff --git a/pkg/space/transport/client.go b/pkg/spaces/transport/client.go
similarity index 97%
rename from pkg/space/transport/client.go
rename to pkg/spaces/transport/client.go
index 44b72b6f5c8f0786f7ad7a255b9e46b69f672647..4f13271e628dba08e0806e462dfed21e0f1bb7ec 100644
--- a/pkg/space/transport/client.go
+++ b/pkg/spaces/transport/client.go
@@ -5,7 +5,7 @@ package transport
 import (
 	"context"
 
-	spaces "git.perx.ru/perxis/perxis-go/pkg/space"
+	spaces "git.perx.ru/perxis/perxis-go/pkg/spaces"
 )
 
 func (set EndpointsSet) Create(arg0 context.Context, arg1 *spaces.Space) (res0 *spaces.Space, res1 error) {
diff --git a/pkg/space/transport/endpoints.microgen.go b/pkg/spaces/transport/endpoints.microgen.go
similarity index 100%
rename from pkg/space/transport/endpoints.microgen.go
rename to pkg/spaces/transport/endpoints.microgen.go
diff --git a/pkg/space/transport/exchanges.microgen.go b/pkg/spaces/transport/exchanges.microgen.go
similarity index 94%
rename from pkg/space/transport/exchanges.microgen.go
rename to pkg/spaces/transport/exchanges.microgen.go
index 05ad11827f34070ebd644b44a217bcceedfecbc7..106753c63bd80f38c68048767ef83c00fe19a8a4 100644
--- a/pkg/space/transport/exchanges.microgen.go
+++ b/pkg/spaces/transport/exchanges.microgen.go
@@ -2,7 +2,7 @@
 
 package transport
 
-import spaces "git.perx.ru/perxis/perxis-go/pkg/space"
+import spaces "git.perx.ru/perxis/perxis-go/pkg/spaces"
 
 type (
 	CreateRequest struct {
diff --git a/pkg/space/transport/grpc/client.go b/pkg/spaces/transport/grpc/client.go
similarity index 92%
rename from pkg/space/transport/grpc/client.go
rename to pkg/spaces/transport/grpc/client.go
index bfa48ae9df7c4bff443f5bbaa3d88c37f1fa26bc..693011ce92883ad758d1764ec6b2b6e34bc1782b 100644
--- a/pkg/space/transport/grpc/client.go
+++ b/pkg/spaces/transport/grpc/client.go
@@ -4,7 +4,7 @@ package transportgrpc
 
 import (
 	grpcerr "git.perx.ru/perxis/perxis-go/pkg/errors/grpc"
-	transport "git.perx.ru/perxis/perxis-go/pkg/space/transport"
+	transport "git.perx.ru/perxis/perxis-go/pkg/spaces/transport"
 	grpckit "github.com/go-kit/kit/transport/grpc"
 	grpc "google.golang.org/grpc"
 )
diff --git a/pkg/space/transport/grpc/client.microgen.go b/pkg/spaces/transport/grpc/client.microgen.go
similarity index 95%
rename from pkg/space/transport/grpc/client.microgen.go
rename to pkg/spaces/transport/grpc/client.microgen.go
index b0d7d35e8e14c5ffa1d852d16e899160af5bb55e..d6547f84c58f89e44f84e2e92aa325ca349a8919 100644
--- a/pkg/space/transport/grpc/client.microgen.go
+++ b/pkg/spaces/transport/grpc/client.microgen.go
@@ -3,7 +3,7 @@
 package transportgrpc
 
 import (
-	transport "git.perx.ru/perxis/perxis-go/pkg/space/transport"
+	transport "git.perx.ru/perxis/perxis-go/pkg/spaces/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/spaces"
 	grpckit "github.com/go-kit/kit/transport/grpc"
 	empty "github.com/golang/protobuf/ptypes/empty"
diff --git a/pkg/space/transport/grpc/protobuf_endpoint_converters.microgen.go b/pkg/spaces/transport/grpc/protobuf_endpoint_converters.microgen.go
similarity index 99%
rename from pkg/space/transport/grpc/protobuf_endpoint_converters.microgen.go
rename to pkg/spaces/transport/grpc/protobuf_endpoint_converters.microgen.go
index 606d41cfa3335674b487cd861fd5cfb86152b90b..3ea51a2a40ae3b6fbe2a8ef4be0fbae4cf0620f3 100644
--- a/pkg/space/transport/grpc/protobuf_endpoint_converters.microgen.go
+++ b/pkg/spaces/transport/grpc/protobuf_endpoint_converters.microgen.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"errors"
 
-	transport "git.perx.ru/perxis/perxis-go/pkg/space/transport"
+	transport "git.perx.ru/perxis/perxis-go/pkg/spaces/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/spaces"
 	empty "github.com/golang/protobuf/ptypes/empty"
 )
diff --git a/pkg/space/transport/grpc/protobuf_type_converters.microgen.go b/pkg/spaces/transport/grpc/protobuf_type_converters.microgen.go
similarity index 97%
rename from pkg/space/transport/grpc/protobuf_type_converters.microgen.go
rename to pkg/spaces/transport/grpc/protobuf_type_converters.microgen.go
index 56e2dc38265de3a9fa239b3d4d8cb37873558796..27bb510db48d5d8ac09ad6101989a2395a47a32a 100644
--- a/pkg/space/transport/grpc/protobuf_type_converters.microgen.go
+++ b/pkg/spaces/transport/grpc/protobuf_type_converters.microgen.go
@@ -5,7 +5,7 @@
 package transportgrpc
 
 import (
-	service "git.perx.ru/perxis/perxis-go/pkg/space"
+	service "git.perx.ru/perxis/perxis-go/pkg/spaces"
 	pb "git.perx.ru/perxis/perxis-go/proto/spaces"
 )
 
diff --git a/pkg/space/transport/grpc/server.go b/pkg/spaces/transport/grpc/server.go
similarity index 80%
rename from pkg/space/transport/grpc/server.go
rename to pkg/spaces/transport/grpc/server.go
index f8220070b19fe5cc9a51ed7bdd8aa6fe5579d428..bd38b0b922277ec39816503413faa840535d6617 100644
--- a/pkg/space/transport/grpc/server.go
+++ b/pkg/spaces/transport/grpc/server.go
@@ -2,13 +2,13 @@ package transportgrpc
 
 import (
 	grpcerr "git.perx.ru/perxis/perxis-go/pkg/errors/grpc"
-	"git.perx.ru/perxis/perxis-go/pkg/space"
-	"git.perx.ru/perxis/perxis-go/pkg/space/transport"
+	"git.perx.ru/perxis/perxis-go/pkg/spaces"
+	"git.perx.ru/perxis/perxis-go/pkg/spaces/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/spaces"
 	grpckit "github.com/go-kit/kit/transport/grpc"
 )
 
-func NewServer(svc space.Spaces, opts ...grpckit.ServerOption) pb.SpacesServer {
+func NewServer(svc spaces.Spaces, opts ...grpckit.ServerOption) pb.SpacesServer {
 	eps := transport.Endpoints(svc)
 	eps = transport.EndpointsSet{
 		CreateEndpoint:       grpcerr.ServerMiddleware(eps.CreateEndpoint),
diff --git a/pkg/space/transport/grpc/server.microgen.go b/pkg/spaces/transport/grpc/server.microgen.go
similarity index 97%
rename from pkg/space/transport/grpc/server.microgen.go
rename to pkg/spaces/transport/grpc/server.microgen.go
index 0d00433457f573073eeeabe5e41c4a3803d69c20..437b8ad385dfcb8c912c356d2ac41506ea49de79 100644
--- a/pkg/space/transport/grpc/server.microgen.go
+++ b/pkg/spaces/transport/grpc/server.microgen.go
@@ -4,7 +4,7 @@
 package transportgrpc
 
 import (
-	transport "git.perx.ru/perxis/perxis-go/pkg/space/transport"
+	transport "git.perx.ru/perxis/perxis-go/pkg/spaces/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/spaces"
 	grpc "github.com/go-kit/kit/transport/grpc"
 	empty "github.com/golang/protobuf/ptypes/empty"
diff --git a/pkg/space/transport/server.microgen.go b/pkg/spaces/transport/server.microgen.go
similarity index 97%
rename from pkg/space/transport/server.microgen.go
rename to pkg/spaces/transport/server.microgen.go
index b4546383c62dae4fdc994a79f17ba3ee4345ceb1..864dbffe26d8422848f44c6f27b513ae5033a521 100644
--- a/pkg/space/transport/server.microgen.go
+++ b/pkg/spaces/transport/server.microgen.go
@@ -5,7 +5,7 @@ package transport
 import (
 	"context"
 
-	spaces "git.perx.ru/perxis/perxis-go/pkg/space"
+	spaces "git.perx.ru/perxis/perxis-go/pkg/spaces"
 	endpoint "github.com/go-kit/kit/endpoint"
 )