diff --git a/examples/collections_auth_client.py b/examples/collections_auth_client.py
index 16cdd2f4a0925be67e83e8457a3f244781368aa1..0c9022b9b7f27842e5849ddaf9dacfb895a1e518 100644
--- a/examples/collections_auth_client.py
+++ b/examples/collections_auth_client.py
@@ -4,8 +4,7 @@ import grpc
 from oauthlib.oauth2 import BackendApplicationClient
 
 from perxis.auth import OAuth2Plugin
-from perxis.collections_perxis.collections_pb2 import ListRequest
-from perxis.collections_perxis.collections_pb2_grpc import CollectionsStub
+from perxis.collections import collections_pb2, collections_pb2_grpc
 
 
 def main():
@@ -27,8 +26,8 @@ def main():
             channel_credentials, call_credentials
     )
     with grpc.secure_channel('envoy.perxis.pt.perx.ru:443', composite_credentials) as channel:
-        stub = CollectionsStub(channel)
-        collections = stub.List(ListRequest(space_id="c1mrvup3e6litup7tf0g", env_id="master"))
+        stub = collections_pb2_grpc.CollectionsStub(channel)
+        collections = stub.List(collections_pb2.ListRequest(space_id="c2qcp9cuaccmpj8lmom0", env_id="master"))
         print(collections)
 
 
diff --git a/examples/collections_client.py b/examples/collections_client.py
index b2383d9b8606ef8de26273320a7262c2da76e3fa..e38586d7b1f3b4a838c77d9ef5f2742d44176bcd 100644
--- a/examples/collections_client.py
+++ b/examples/collections_client.py
@@ -3,17 +3,17 @@ import logging
 
 import grpc
 
-from perxis.collections_perxis import collections_pb2, collections_pb2_grpc
+from perxis.collections import collections_pb2, collections_pb2_grpc
 
 
-ACCESS_TOKEN = 'Bearer eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6Ik5UWXhSVE5FTnprek5qSkVPRFkyTmpORk9VVXhRVEUzUmpWRVFqY3pRVE5CTjBJeE1ETTNOUSJ9.eyJodHRwczovL2hvb3AucGVyeC5ydS9pZGVudGl0eSI6eyJncm91cHMiOltdfSwibmlja25hbWUiOiJnb3NoaWstZSIsIm5hbWUiOiJHZW9yZ2l5IEV0ZXJldnNraXkiLCJwaWN0dXJlIjoiaHR0cHM6Ly9hdmF0YXJzLmdpdGh1YnVzZXJjb250ZW50LmNvbS91Lzc2NjAzMzE_dj00IiwidXBkYXRlZF9hdCI6IjIwMjEtMDQtMjBUMDc6MDM6NTAuMzM5WiIsImlzcyI6Imh0dHBzOi8vYWR3ei5hdXRoMC5jb20vIiwic3ViIjoiZ2l0aHVifDc2NjAzMzEiLCJhdWQiOiJ6d3JaaGZrd0owNlQ3MlE4ZXhOZHRFS0NxTzBja0ZpWCIsImlhdCI6MTYxODkwMjIzMCwiZXhwIjoxNjE4OTM4MjMwLCJhdXRoX3RpbWUiOjE2MTg5MDIyMzAsImF0X2hhc2giOiJNZU1FdkxBRm14N1JXZ3pDaEwxdlBBIiwibm9uY2UiOiJrTEExZDZhM0V4cjBDMlU5UVBoNG5DUkhiQ3ZvcU1TdiJ9.BqkhCwRi7_LZ0FANXU9fe_9MP0lIq7TewBo3OiSe92FXSXmyKMIEeUPnPtp0oUzf6taFgVCyQJiKrbJfpnlZYK4rVetPEWKvGpMiyv4IsQ_6Y7ZTBKdOFZrej0sKB9EFUjkBX01g4ihDyLUaz3xJYZX4qLApEPS4ubAFTuqsa_M1-rI9_8cXa3leMnQHqEOkL2Cb-N2M2uWrXYYzch8PpVyTMiBK39CA8-EJ1z8MGwjcKsqR8wryG4OWCAn84i8kt7wFAad9Tjb6YsCp1v8HlZR4cUj7u2-ztEzHDs5BNbG2dyloizBqh1XScCA261asybQgYDJDEBmqztk9mKgsVg'
-SPACE_ID = "c1mrvup3e6litup7tf0g"
+ACCESS_TOKEN = 'Bearer eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6Ik5UWXhSVE5FTnprek5qSkVPRFkyTmpORk9VVXhRVEUzUmpWRVFqY3pRVE5CTjBJeE1ETTNOUSJ9.eyJodHRwczovL2hvb3AucGVyeC5ydS9pZGVudGl0eSI6eyJncm91cHMiOltdfSwibmlja25hbWUiOiJnb3NoaWstZSIsIm5hbWUiOiJHZW9yZ2l5IEV0ZXJldnNraXkiLCJwaWN0dXJlIjoiaHR0cHM6Ly9hdmF0YXJzLmdpdGh1YnVzZXJjb250ZW50LmNvbS91Lzc2NjAzMzE_dj00IiwidXBkYXRlZF9hdCI6IjIwMjEtMDYtMTFUMTI6MDU6MDkuMjQ3WiIsImlzcyI6Imh0dHBzOi8vYWR3ei5hdXRoMC5jb20vIiwic3ViIjoiZ2l0aHVifDc2NjAzMzEiLCJhdWQiOiJ6d3JaaGZrd0owNlQ3MlE4ZXhOZHRFS0NxTzBja0ZpWCIsImlhdCI6MTYyMzQxMzEwOSwiZXhwIjoxNjIzNDQ5MTA5LCJhdXRoX3RpbWUiOjE2MjM0MTMxMDksImF0X2hhc2giOiIwVTNrRmJTTXpnWllWSVlKTHpMUWNBIiwibm9uY2UiOiJxTGxKZmVMSUtBOUtoMVRoWXE3UkxLSkxCMjF-X29TZCJ9.Z3BYpwyAUQYt5gyGyQSD14Lj5zwegYqfyaA-tsgVrHYdyYzb8VCG8Tb_CbZ6zjpRGpcOSuDCgPo6b8METTUoHTBgWyPgaYXLWeoecE4FjRrFgonL0Yltg0BAMG8hACxTkLsg3q3s1pA0FdUzNesDPRWgoyTQehh7ODwFCV9FLpV3aV1RYwqj3I_qMsfATCoDsn2_msozB2asge9PsH8cblQj5ZdT2JEFTU0ZLI-MFNu6aubpHd3WIgMXmfgmDASrsARx-W59enwZSls01Y3WRLfoQVZ8YqjdnOIXeolfkpr32DSuzcgOP_oxylXSa_grMlCbRBOZd1Z84teYteNU0g'
+SPACE_ID = 'c2qcp9cuaccmpj8lmom0'
 ENV_ID = "master"
 
 
 def create(stub, space_id, env_id, coll_id, name):
     return stub.Create.with_call(
-        collections_pb2.CreateRequest(coll=collections_pb2.Collection(space_id=space_id, env_id=env_id, id=coll_id, name=name)),
+        collections_pb2.CreateRequest(collection=collections_pb2.Collection(space_id=space_id, env_id=env_id, id=coll_id, name=name)),
         metadata=(
             ('authorization', f'{ACCESS_TOKEN}'),
         )
@@ -41,7 +41,7 @@ def list(stub, space_id, env_id):
 def update(stub, space_id, env_id, coll_id, name):
     return stub.Update.with_call(
         collections_pb2.UpdateRequest(
-            coll=collections_pb2.Collection(space_id=space_id, env_id=env_id, id=coll_id, name=name)),
+            collection=collections_pb2.Collection(space_id=space_id, env_id=env_id, id=coll_id, name=name)),
         metadata=(
             ('authorization', f'{ACCESS_TOKEN}'),
         )
diff --git a/examples/environments.py b/examples/environments.py
index d4cc6c5355b0970c7c879d51aeff00737cf8591c..2879b0074c1d1e9a5d434ac96134b4bc2f735e21 100644
--- a/examples/environments.py
+++ b/examples/environments.py
@@ -5,8 +5,8 @@ import grpc
 
 from perxis.environments import environments_pb2, environments_pb2_grpc
 
-ACCESS_TOKEN = 'Bearer eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6Ik5UWXhSVE5FTnprek5qSkVPRFkyTmpORk9VVXhRVEUzUmpWRVFqY3pRVE5CTjBJeE1ETTNOUSJ9.eyJodHRwczovL2hvb3AucGVyeC5ydS9pZGVudGl0eSI6eyJncm91cHMiOltdfSwibmlja25hbWUiOiJnb3NoaWstZSIsIm5hbWUiOiJHZW9yZ2l5IEV0ZXJldnNraXkiLCJwaWN0dXJlIjoiaHR0cHM6Ly9hdmF0YXJzLmdpdGh1YnVzZXJjb250ZW50LmNvbS91Lzc2NjAzMzE_dj00IiwidXBkYXRlZF9hdCI6IjIwMjEtMDQtMTlUMTg6MjU6NDYuOTYxWiIsImlzcyI6Imh0dHBzOi8vYWR3ei5hdXRoMC5jb20vIiwic3ViIjoiZ2l0aHVifDc2NjAzMzEiLCJhdWQiOiJ6d3JaaGZrd0owNlQ3MlE4ZXhOZHRFS0NxTzBja0ZpWCIsImlhdCI6MTYxODg1Njc0NywiZXhwIjoxNjE4ODkyNzQ3LCJhdXRoX3RpbWUiOjE2MTg4NTY3NDYsImF0X2hhc2giOiJoWnF4QkJUSzFrNmxobEdONXRjZXZnIiwibm9uY2UiOiJzQWFFUkJNMGI3dlprVGtZeU9xelRBT3N2S0pad0lraiJ9.Styt3ppV18Pfn_ZW3s8GPzg4nekadUjClpQXvbWZNvQb--fb8jbLsR2_pQnpjsHwO65XpEiWDinCk_cP8Qw5pqtRwhLNqueYoLPsUVKn31VyF16CSHEmRI0vaBiVPiHJmPEOHCGfKdzYlEzy73mFiSvr-oKGoXF4nkKE6a1ahimw07x8pHI5uM6JPYMMeli-1SQ7kgclFbMUhUV5hCtItKaxFfxSLDi0OjQXqGXlgMBi2k7VOfEbhMimCRnkBCsAR9kCrL1vDR8Eg3IMcVh1b-XbTX1YFxYk8B9no7qFq2Ut8PervBNSutD4rNpvtSDxGJb6fuSrxKqkAJDmB6MA9Q'
-SPACE_ID = 'c1mrvup3e6litup7tf0g'
+ACCESS_TOKEN = 'Bearer eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6Ik5UWXhSVE5FTnprek5qSkVPRFkyTmpORk9VVXhRVEUzUmpWRVFqY3pRVE5CTjBJeE1ETTNOUSJ9.eyJodHRwczovL2hvb3AucGVyeC5ydS9pZGVudGl0eSI6eyJncm91cHMiOltdfSwibmlja25hbWUiOiJnb3NoaWstZSIsIm5hbWUiOiJHZW9yZ2l5IEV0ZXJldnNraXkiLCJwaWN0dXJlIjoiaHR0cHM6Ly9hdmF0YXJzLmdpdGh1YnVzZXJjb250ZW50LmNvbS91Lzc2NjAzMzE_dj00IiwidXBkYXRlZF9hdCI6IjIwMjEtMDYtMTFUMTI6MDU6MDkuMjQ3WiIsImlzcyI6Imh0dHBzOi8vYWR3ei5hdXRoMC5jb20vIiwic3ViIjoiZ2l0aHVifDc2NjAzMzEiLCJhdWQiOiJ6d3JaaGZrd0owNlQ3MlE4ZXhOZHRFS0NxTzBja0ZpWCIsImlhdCI6MTYyMzQxMzEwOSwiZXhwIjoxNjIzNDQ5MTA5LCJhdXRoX3RpbWUiOjE2MjM0MTMxMDksImF0X2hhc2giOiIwVTNrRmJTTXpnWllWSVlKTHpMUWNBIiwibm9uY2UiOiJxTGxKZmVMSUtBOUtoMVRoWXE3UkxLSkxCMjF-X29TZCJ9.Z3BYpwyAUQYt5gyGyQSD14Lj5zwegYqfyaA-tsgVrHYdyYzb8VCG8Tb_CbZ6zjpRGpcOSuDCgPo6b8METTUoHTBgWyPgaYXLWeoecE4FjRrFgonL0Yltg0BAMG8hACxTkLsg3q3s1pA0FdUzNesDPRWgoyTQehh7ODwFCV9FLpV3aV1RYwqj3I_qMsfATCoDsn2_msozB2asge9PsH8cblQj5ZdT2JEFTU0ZLI-MFNu6aubpHd3WIgMXmfgmDASrsARx-W59enwZSls01Y3WRLfoQVZ8YqjdnOIXeolfkpr32DSuzcgOP_oxylXSa_grMlCbRBOZd1Z84teYteNU0g'
+SPACE_ID = 'c2qcp9cuaccmpj8lmom0'
 
 
 def create(stub, space_id, description):
diff --git a/examples/items.py b/examples/items.py
index 1d2d58be33277d9aa792684a35119343eea333fe..1a04d4e1e857017e840f772408b130e8d5183481 100644
--- a/examples/items.py
+++ b/examples/items.py
@@ -7,8 +7,8 @@ from perxis.items import items_pb2, items_pb2_grpc
 from google.protobuf.struct_pb2 import Struct
 
 
-ACCESS_TOKEN = 'Bearer eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6Ik5UWXhSVE5FTnprek5qSkVPRFkyTmpORk9VVXhRVEUzUmpWRVFqY3pRVE5CTjBJeE1ETTNOUSJ9.eyJodHRwczovL2hvb3AucGVyeC5ydS9pZGVudGl0eSI6eyJncm91cHMiOltdfSwibmlja25hbWUiOiJnb3NoaWstZSIsIm5hbWUiOiJHZW9yZ2l5IEV0ZXJldnNraXkiLCJwaWN0dXJlIjoiaHR0cHM6Ly9hdmF0YXJzLmdpdGh1YnVzZXJjb250ZW50LmNvbS91Lzc2NjAzMzE_dj00IiwidXBkYXRlZF9hdCI6IjIwMjEtMDQtMjBUMDc6MDM6NTAuMzM5WiIsImlzcyI6Imh0dHBzOi8vYWR3ei5hdXRoMC5jb20vIiwic3ViIjoiZ2l0aHVifDc2NjAzMzEiLCJhdWQiOiJ6d3JaaGZrd0owNlQ3MlE4ZXhOZHRFS0NxTzBja0ZpWCIsImlhdCI6MTYxODkwMjIzMCwiZXhwIjoxNjE4OTM4MjMwLCJhdXRoX3RpbWUiOjE2MTg5MDIyMzAsImF0X2hhc2giOiJNZU1FdkxBRm14N1JXZ3pDaEwxdlBBIiwibm9uY2UiOiJrTEExZDZhM0V4cjBDMlU5UVBoNG5DUkhiQ3ZvcU1TdiJ9.BqkhCwRi7_LZ0FANXU9fe_9MP0lIq7TewBo3OiSe92FXSXmyKMIEeUPnPtp0oUzf6taFgVCyQJiKrbJfpnlZYK4rVetPEWKvGpMiyv4IsQ_6Y7ZTBKdOFZrej0sKB9EFUjkBX01g4ihDyLUaz3xJYZX4qLApEPS4ubAFTuqsa_M1-rI9_8cXa3leMnQHqEOkL2Cb-N2M2uWrXYYzch8PpVyTMiBK39CA8-EJ1z8MGwjcKsqR8wryG4OWCAn84i8kt7wFAad9Tjb6YsCp1v8HlZR4cUj7u2-ztEzHDs5BNbG2dyloizBqh1XScCA261asybQgYDJDEBmqztk9mKgsVg'
-SPACE_ID = 'c1mrvup3e6litup7tf0g'
+ACCESS_TOKEN = 'Bearer eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6Ik5UWXhSVE5FTnprek5qSkVPRFkyTmpORk9VVXhRVEUzUmpWRVFqY3pRVE5CTjBJeE1ETTNOUSJ9.eyJodHRwczovL2hvb3AucGVyeC5ydS9pZGVudGl0eSI6eyJncm91cHMiOltdfSwibmlja25hbWUiOiJnb3NoaWstZSIsIm5hbWUiOiJHZW9yZ2l5IEV0ZXJldnNraXkiLCJwaWN0dXJlIjoiaHR0cHM6Ly9hdmF0YXJzLmdpdGh1YnVzZXJjb250ZW50LmNvbS91Lzc2NjAzMzE_dj00IiwidXBkYXRlZF9hdCI6IjIwMjEtMDYtMTFUMTI6MDU6MDkuMjQ3WiIsImlzcyI6Imh0dHBzOi8vYWR3ei5hdXRoMC5jb20vIiwic3ViIjoiZ2l0aHVifDc2NjAzMzEiLCJhdWQiOiJ6d3JaaGZrd0owNlQ3MlE4ZXhOZHRFS0NxTzBja0ZpWCIsImlhdCI6MTYyMzQxMzEwOSwiZXhwIjoxNjIzNDQ5MTA5LCJhdXRoX3RpbWUiOjE2MjM0MTMxMDksImF0X2hhc2giOiIwVTNrRmJTTXpnWllWSVlKTHpMUWNBIiwibm9uY2UiOiJxTGxKZmVMSUtBOUtoMVRoWXE3UkxLSkxCMjF-X29TZCJ9.Z3BYpwyAUQYt5gyGyQSD14Lj5zwegYqfyaA-tsgVrHYdyYzb8VCG8Tb_CbZ6zjpRGpcOSuDCgPo6b8METTUoHTBgWyPgaYXLWeoecE4FjRrFgonL0Yltg0BAMG8hACxTkLsg3q3s1pA0FdUzNesDPRWgoyTQehh7ODwFCV9FLpV3aV1RYwqj3I_qMsfATCoDsn2_msozB2asge9PsH8cblQj5ZdT2JEFTU0ZLI-MFNu6aubpHd3WIgMXmfgmDASrsARx-W59enwZSls01Y3WRLfoQVZ8YqjdnOIXeolfkpr32DSuzcgOP_oxylXSa_grMlCbRBOZd1Z84teYteNU0g'
+SPACE_ID = 'c2qcp9cuaccmpj8lmom0'
 ENV_ID = 'master'
 COLL_ID = 'test_eterevskiy'
 
diff --git a/examples/spaces.py b/examples/spaces.py
index 13d474b1590d508f65c3c2cd9e03e9888850af41..667de051c9963f236fcc641b2d6579d8679a46f5 100644
--- a/examples/spaces.py
+++ b/examples/spaces.py
@@ -5,8 +5,8 @@ import grpc
 
 from perxis.spaces import spaces_pb2, spaces_pb2_grpc
 
-ACCESS_TOKEN = 'Bearer eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6Ik5UWXhSVE5FTnprek5qSkVPRFkyTmpORk9VVXhRVEUzUmpWRVFqY3pRVE5CTjBJeE1ETTNOUSJ9.eyJodHRwczovL2hvb3AucGVyeC5ydS9pZGVudGl0eSI6eyJncm91cHMiOltdfSwibmlja25hbWUiOiJnb3NoaWstZSIsIm5hbWUiOiJHZW9yZ2l5IEV0ZXJldnNraXkiLCJwaWN0dXJlIjoiaHR0cHM6Ly9hdmF0YXJzLmdpdGh1YnVzZXJjb250ZW50LmNvbS91Lzc2NjAzMzE_dj00IiwidXBkYXRlZF9hdCI6IjIwMjEtMDQtMTlUMTg6MjU6NDYuOTYxWiIsImlzcyI6Imh0dHBzOi8vYWR3ei5hdXRoMC5jb20vIiwic3ViIjoiZ2l0aHVifDc2NjAzMzEiLCJhdWQiOiJ6d3JaaGZrd0owNlQ3MlE4ZXhOZHRFS0NxTzBja0ZpWCIsImlhdCI6MTYxODg1Njc0NywiZXhwIjoxNjE4ODkyNzQ3LCJhdXRoX3RpbWUiOjE2MTg4NTY3NDYsImF0X2hhc2giOiJoWnF4QkJUSzFrNmxobEdONXRjZXZnIiwibm9uY2UiOiJzQWFFUkJNMGI3dlprVGtZeU9xelRBT3N2S0pad0lraiJ9.Styt3ppV18Pfn_ZW3s8GPzg4nekadUjClpQXvbWZNvQb--fb8jbLsR2_pQnpjsHwO65XpEiWDinCk_cP8Qw5pqtRwhLNqueYoLPsUVKn31VyF16CSHEmRI0vaBiVPiHJmPEOHCGfKdzYlEzy73mFiSvr-oKGoXF4nkKE6a1ahimw07x8pHI5uM6JPYMMeli-1SQ7kgclFbMUhUV5hCtItKaxFfxSLDi0OjQXqGXlgMBi2k7VOfEbhMimCRnkBCsAR9kCrL1vDR8Eg3IMcVh1b-XbTX1YFxYk8B9no7qFq2Ut8PervBNSutD4rNpvtSDxGJb6fuSrxKqkAJDmB6MA9Q'
-SPACE_ID = 'c1mrvup3e6litup7tf0g'
+ACCESS_TOKEN = 'Bearer eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6Ik5UWXhSVE5FTnprek5qSkVPRFkyTmpORk9VVXhRVEUzUmpWRVFqY3pRVE5CTjBJeE1ETTNOUSJ9.eyJodHRwczovL2hvb3AucGVyeC5ydS9pZGVudGl0eSI6eyJncm91cHMiOltdfSwibmlja25hbWUiOiJnb3NoaWstZSIsIm5hbWUiOiJHZW9yZ2l5IEV0ZXJldnNraXkiLCJwaWN0dXJlIjoiaHR0cHM6Ly9hdmF0YXJzLmdpdGh1YnVzZXJjb250ZW50LmNvbS91Lzc2NjAzMzE_dj00IiwidXBkYXRlZF9hdCI6IjIwMjEtMDYtMTFUMTI6MDU6MDkuMjQ3WiIsImlzcyI6Imh0dHBzOi8vYWR3ei5hdXRoMC5jb20vIiwic3ViIjoiZ2l0aHVifDc2NjAzMzEiLCJhdWQiOiJ6d3JaaGZrd0owNlQ3MlE4ZXhOZHRFS0NxTzBja0ZpWCIsImlhdCI6MTYyMzQxMzEwOSwiZXhwIjoxNjIzNDQ5MTA5LCJhdXRoX3RpbWUiOjE2MjM0MTMxMDksImF0X2hhc2giOiIwVTNrRmJTTXpnWllWSVlKTHpMUWNBIiwibm9uY2UiOiJxTGxKZmVMSUtBOUtoMVRoWXE3UkxLSkxCMjF-X29TZCJ9.Z3BYpwyAUQYt5gyGyQSD14Lj5zwegYqfyaA-tsgVrHYdyYzb8VCG8Tb_CbZ6zjpRGpcOSuDCgPo6b8METTUoHTBgWyPgaYXLWeoecE4FjRrFgonL0Yltg0BAMG8hACxTkLsg3q3s1pA0FdUzNesDPRWgoyTQehh7ODwFCV9FLpV3aV1RYwqj3I_qMsfATCoDsn2_msozB2asge9PsH8cblQj5ZdT2JEFTU0ZLI-MFNu6aubpHd3WIgMXmfgmDASrsARx-W59enwZSls01Y3WRLfoQVZ8YqjdnOIXeolfkpr32DSuzcgOP_oxylXSa_grMlCbRBOZd1Z84teYteNU0g'
+SPACE_ID = 'c2qcp9cuaccmpj8lmom0'
 
 
 def get(stub, space_id):