From 71a73fb6e58ba5fed14d14433d03fc49010bd97e Mon Sep 17 00:00:00 2001
From: Konstantin Osipov <kostja@tarantool.org>
Date: Fri, 20 Feb 2015 20:39:15 +0300
Subject: [PATCH] tests: use box.schema.space.create rather than create_space

---
 test/app/float_value.test.lua            |  2 +-
 test/app/init_script.test.lua            |  2 +-
 test/app/trigger_atexit.test.lua         |  2 +-
 test/big/hash.result                     |  4 +-
 test/big/hash.test.lua                   |  4 +-
 test/big/hash_multipart.result           |  2 +-
 test/big/hash_multipart.test.lua         |  2 +-
 test/big/iterator.result                 |  6 +--
 test/big/iterator.test.lua               |  6 +--
 test/big/lua.result                      | 20 ++++----
 test/big/lua.test.lua                    | 20 ++++----
 test/big/sql.result                      |  2 +-
 test/big/sql.test.py                     |  2 +-
 test/big/tree_pk.result                  |  6 +--
 test/big/tree_pk.test.lua                |  6 +--
 test/big/tree_pk_multipart.result        |  4 +-
 test/big/tree_pk_multipart.test.lua      |  4 +-
 test/big/tree_variants.result            |  2 +-
 test/big/tree_variants.test.lua          |  2 +-
 test/box/access.result                   |  8 ++--
 test/box/access.test.lua                 |  8 ++--
 test/box/access_misc.result              | 14 +++---
 test/box/access_misc.test.lua            | 14 +++---
 test/box/admin.result                    |  2 +-
 test/box/admin.test.lua                  |  2 +-
 test/box/alter.result                    | 42 ++++++++---------
 test/box/alter.test.lua                  | 42 ++++++++---------
 test/box/alter_limits.result             | 60 ++++++++++++------------
 test/box/alter_limits.test.lua           | 60 ++++++++++++------------
 test/box/call.result                     |  4 +-
 test/box/call.test.py                    |  4 +-
 test/box/crossjoin.result                |  2 +-
 test/box/crossjoin.test.lua              |  2 +-
 test/box/errinj.result                   | 12 ++---
 test/box/errinj.test.lua                 | 12 ++---
 test/box/errinj_index.result             |  4 +-
 test/box/errinj_index.test.lua           |  4 +-
 test/box/fiber.result                    |  2 +-
 test/box/fiber.test.lua                  |  2 +-
 test/box/insert.result                   |  2 +-
 test/box/insert.test.lua                 |  2 +-
 test/box/iproto.result                   |  4 +-
 test/box/iproto.test.py                  |  4 +-
 test/box/luafun.result                   |  2 +-
 test/box/luafun.test.lua                 |  2 +-
 test/box/misc.result                     |  2 +-
 test/box/misc.test.lua                   |  2 +-
 test/box/net.box.result                  |  6 +--
 test/box/net.box.test.lua                |  6 +--
 test/box/on_replace.result               |  2 +-
 test/box/on_replace.test.lua             |  2 +-
 test/box/protocol.result                 |  2 +-
 test/box/protocol.test.lua               |  2 +-
 test/box/reconfigure.result              |  2 +-
 test/box/reconfigure.test.lua            |  2 +-
 test/box/rtree_array.result              |  2 +-
 test/box/rtree_array.test.lua            |  2 +-
 test/box/rtree_errinj.test.lua           |  2 +-
 test/box/rtree_misc.result               |  8 ++--
 test/box/rtree_misc.test.lua             |  8 ++--
 test/box/rtree_point.result              |  2 +-
 test/box/rtree_point.test.lua            |  2 +-
 test/box/rtree_point_r2.result           |  2 +-
 test/box/rtree_point_r2.test.lua         |  2 +-
 test/box/rtree_rect.result               |  2 +-
 test/box/rtree_rect.test.lua             |  2 +-
 test/box/schema.result                   |  6 +--
 test/box/schema.test.lua                 |  6 +--
 test/box/select.result                   |  4 +-
 test/box/select.test.lua                 |  4 +-
 test/box/session.result                  |  2 +-
 test/box/session.test.lua                |  2 +-
 test/box/snapshot.result                 |  2 +-
 test/box/snapshot.test.py                |  2 +-
 test/box/snapshot_daemon.result          |  2 +-
 test/box/snapshot_daemon.test.lua        |  2 +-
 test/box/sql.result                      |  2 +-
 test/box/sql.test.py                     |  2 +-
 test/box/stat.result                     |  2 +-
 test/box/stat.test.lua                   |  2 +-
 test/box/temp_spaces.result              |  8 ++--
 test/box/temp_spaces.test.lua            |  8 ++--
 test/box/transaction.result              |  2 +-
 test/box/transaction.test.lua            |  2 +-
 test/box/tuple.result                    |  2 +-
 test/box/tuple.test.lua                  |  2 +-
 test/box/update.result                   |  4 +-
 test/box/update.test.lua                 |  4 +-
 test/replication/consistent.result       |  2 +-
 test/replication/consistent.test.lua     |  2 +-
 test/replication/hot_standby.result      |  2 +-
 test/replication/hot_standby.test.lua    |  2 +-
 test/replication/init_storage.result     |  2 +-
 test/replication/init_storage.test.py    |  2 +-
 test/replication/readonly.result         |  2 +-
 test/replication/readonly.test.py        |  2 +-
 test/replication/swap.result             |  2 +-
 test/replication/swap.test.py            |  2 +-
 test/sophia/crud.result                  |  2 +-
 test/sophia/crud.test.lua                |  2 +-
 test/sophia/dml.result                   | 16 +++----
 test/sophia/dml.test.lua                 | 16 +++----
 test/sophia/gh.result                    | 14 +++---
 test/sophia/gh.test.lua                  | 14 +++---
 test/sophia/info.result                  |  2 +-
 test/sophia/info.test.lua                |  2 +-
 test/sophia/random.result                |  2 +-
 test/sophia/random.test.lua              |  2 +-
 test/sophia/snapshot.result              |  2 +-
 test/sophia/snapshot.test.lua            |  2 +-
 test/sophia/transaction.result           |  2 +-
 test/sophia/transaction.test.lua         |  2 +-
 test/sophia/transaction_multidb.result   |  4 +-
 test/sophia/transaction_multidb.test.lua |  4 +-
 test/sophia/truncate.test.lua            |  2 +-
 test/xlog/xlog.result                    | 32 ++++++-------
 test/xlog/xlog.test.py                   | 32 ++++++-------
 117 files changed, 361 insertions(+), 361 deletions(-)

diff --git a/test/app/float_value.test.lua b/test/app/float_value.test.lua
index a9a0d2ae14..8ce550aa3b 100755
--- a/test/app/float_value.test.lua
+++ b/test/app/float_value.test.lua
@@ -14,7 +14,7 @@ box.cfg{
 if box.space.space1 ~= nil then
     box.space.space1:drop()
 end
-s = box.schema.create_space('space1')
+s = box.schema.space.create('space1')
 s:create_index('primary', {type = 'hash', parts = {1, 'NUM'}})
 
 t = {}
diff --git a/test/app/init_script.test.lua b/test/app/init_script.test.lua
index 6a9e328c32..d79c24e754 100755
--- a/test/app/init_script.test.lua
+++ b/test/app/init_script.test.lua
@@ -16,7 +16,7 @@ if box.space.tweedledum ~= nil then
     box.space.space1:drop()
 end
 
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 space:create_index('primary', { type = 'hash' })
 
 print[[
diff --git a/test/app/trigger_atexit.test.lua b/test/app/trigger_atexit.test.lua
index a6044ec397..46d06f0f0f 100755
--- a/test/app/trigger_atexit.test.lua
+++ b/test/app/trigger_atexit.test.lua
@@ -22,7 +22,7 @@ local function test_replace(old_tuple, new_tuple)
 end
 
 
-box.schema.create_space('abc')
+box.schema.space.create('abc')
 box.space.abc:create_index('pk', { type = 'tree' })
 box.space.abc:on_replace(test_replace)
 
diff --git a/test/big/hash.result b/test/big/hash.result
index 4988bb424a..9e3e9e7421 100644
--- a/test/big/hash.result
+++ b/test/big/hash.result
@@ -7,7 +7,7 @@ dofile('utils.lua')
 -------------------------------------------------------------------------------
 -- 32-bit hash insert fields tests
 -------------------------------------------------------------------------------
-hash = box.schema.create_space('tweedledum')
+hash = box.schema.space.create('tweedledum')
 ---
 ...
 tmp = hash:create_index('primary', { type = 'hash', parts = {1, 'num'}, unique = true })
@@ -674,7 +674,7 @@ hash.index['field3']:get{0}
 hash:drop()
 ---
 ...
-hash = box.schema.create_space('tweedledum')
+hash = box.schema.space.create('tweedledum')
 ---
 ...
 hi = hash:create_index('primary', { type = 'hash', parts = {1, 'num'}, unique = true })
diff --git a/test/big/hash.test.lua b/test/big/hash.test.lua
index a3dbb69b39..3df6f0be42 100644
--- a/test/big/hash.test.lua
+++ b/test/big/hash.test.lua
@@ -6,7 +6,7 @@ dofile('utils.lua')
 -------------------------------------------------------------------------------
 -- 32-bit hash insert fields tests
 -------------------------------------------------------------------------------
-hash = box.schema.create_space('tweedledum')
+hash = box.schema.space.create('tweedledum')
 tmp = hash:create_index('primary', { type = 'hash', parts = {1, 'num'}, unique = true })
 
 -- Insert valid fields
@@ -289,7 +289,7 @@ hash.index['field3']:get{0}
 
 hash:drop()
 
-hash = box.schema.create_space('tweedledum')
+hash = box.schema.space.create('tweedledum')
 hi = hash:create_index('primary', { type = 'hash', parts = {1, 'num'}, unique = true })
 hash:insert{0}
 hash:insert{16}
diff --git a/test/big/hash_multipart.result b/test/big/hash_multipart.result
index 04a55e1862..18545202e2 100644
--- a/test/big/hash_multipart.result
+++ b/test/big/hash_multipart.result
@@ -1,7 +1,7 @@
 dofile('utils.lua')
 ---
 ...
-hash = box.schema.create_space('tweedledum')
+hash = box.schema.space.create('tweedledum')
 ---
 ...
 tmp = hash:create_index('primary', { type = 'hash', parts = {1, 'num', 2, 'str', 3, 'num'}, unique = true })
diff --git a/test/big/hash_multipart.test.lua b/test/big/hash_multipart.test.lua
index 707b7ecca5..b07883888a 100644
--- a/test/big/hash_multipart.test.lua
+++ b/test/big/hash_multipart.test.lua
@@ -1,6 +1,6 @@
 dofile('utils.lua')
 
-hash = box.schema.create_space('tweedledum')
+hash = box.schema.space.create('tweedledum')
 tmp = hash:create_index('primary', { type = 'hash', parts = {1, 'num', 2, 'str', 3, 'num'}, unique = true })
 tmp = hash:create_index('unique', { type = 'hash', parts = {3, 'num', 5, 'num'}, unique = true })
 
diff --git a/test/big/iterator.result b/test/big/iterator.result
index d9cf49310c..0f64084334 100644
--- a/test/big/iterator.result
+++ b/test/big/iterator.result
@@ -4,7 +4,7 @@ dofile('utils.lua')
 # Tree single-part unique
 ---
 ...
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 ---
 ...
 idx1 = space:create_index('primary', { type = 'tree', parts = {1, 'str'}, unique = true})
@@ -918,7 +918,7 @@ space:drop()
 -- Iterator: https://github.com/tarantool/tarantool/issues/464
 -- Iterator safety after changing schema
 -------------------------------------------------------------------------------
-space = box.schema.create_space('test', {temporary=true})
+space = box.schema.space.create('test', {temporary=true})
 ---
 ...
 idx1 = space:create_index('primary', {type='HASH',unique=true})
@@ -989,7 +989,7 @@ space:drop()
 -- Iterator: https://github.com/tarantool/tarantool/issues/498
 -- Iterator is not checked for wrong type; accept lowercase iterator
 -------------------------------------------------------------------------------
-space = box.schema.create_space('test', {temporary=true})
+space = box.schema.space.create('test', {temporary=true})
 ---
 ...
 idx1 = space:create_index('primary', {type='TREE',unique=true})
diff --git a/test/big/iterator.test.lua b/test/big/iterator.test.lua
index dd98004995..b61d8f951f 100644
--- a/test/big/iterator.test.lua
+++ b/test/big/iterator.test.lua
@@ -2,7 +2,7 @@ dofile('utils.lua')
 
 # Tree single-part unique
 
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 idx1 = space:create_index('primary', { type = 'tree', parts = {1, 'str'}, unique = true})
 -- Tree single-part non-unique
 idx2 = space:create_index('i1', { type = 'tree', parts = {2, 'str'}, unique = false})
@@ -176,7 +176,7 @@ space:drop()
 -- Iterator safety after changing schema
 -------------------------------------------------------------------------------
 
-space = box.schema.create_space('test', {temporary=true})
+space = box.schema.space.create('test', {temporary=true})
 idx1 = space:create_index('primary', {type='HASH',unique=true})
 idx2 = space:create_index('t1', {type='TREE',unique=true})
 idx3 = space:create_index('t2', {type='TREE',unique=true})
@@ -207,7 +207,7 @@ space:drop()
 -- Iterator is not checked for wrong type; accept lowercase iterator
 -------------------------------------------------------------------------------
 
-space = box.schema.create_space('test', {temporary=true})
+space = box.schema.space.create('test', {temporary=true})
 idx1 = space:create_index('primary', {type='TREE',unique=true})
 space:insert{0}
 space:insert{1}
diff --git a/test/big/lua.result b/test/big/lua.result
index fd6d189316..0dd74ac639 100644
--- a/test/big/lua.result
+++ b/test/big/lua.result
@@ -1,4 +1,4 @@
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 ---
 ...
 tmp = space:create_index('primary', { type = 'hash', parts = {1, 'str'}, unique = true })
@@ -114,7 +114,7 @@ space:drop()
 --
 -- Check range scan over multipart keys
 --
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 ---
 ...
 tmp = space:create_index('primary', { type = 'hash', parts = {1, 'num'}, unique = true })
@@ -165,7 +165,7 @@ space:drop()
 --
 -- Lua 64bit numbers support
 --
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 ---
 ...
 tmp = space:create_index('primary', { type  = 'tree', parts = {1, 'num'}, unique = true })
@@ -272,7 +272,7 @@ space:drop()
 --
 -- lua select_reverse_range() testing
 -- https://blueprints.launchpad.net/tarantool/+spec/backward-tree-index-iterator
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 ---
 ...
 tmp = space:create_index('primary', { type = 'tree', parts = {1, 'num'}, unique = true })
@@ -360,7 +360,7 @@ space:drop()
 --
 -- Tests for box.index iterators
 --
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 ---
 ...
 tmp = space:create_index('primary', { type = 'tree', parts = {1, 'str'}, unique = true })
@@ -484,7 +484,7 @@ space:drop()
 -- Tests for lua idx:count()
 --
 -- https://blueprints.launchpad.net/tarantool/+spec/lua-builtin-size-of-subtree
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 ---
 ...
 tmp = space:create_index('primary', { type = 'hash', parts = {1, 'num'}, unique = true })
@@ -582,7 +582,7 @@ space:drop()
 --
 -- Tests for lua tuple:transform()
 --
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 ---
 ...
 tmp = space:create_index('primary', { type = 'hash', parts = {1, 'str'}, unique = true })
@@ -765,7 +765,7 @@ space:drop()
 -- http://bugs.launchpad.net/tarantool/+bug/1038784
 --  https://bugs.launchpad.net/tarantool/+bug/1006354
 --  lua box.auto_increment() testing
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 ---
 ...
 tmp = space:create_index('primary', { type = 'tree', parts = {1, 'num'}, unique = true })
@@ -849,7 +849,7 @@ space:drop()
 -- Truncate hangs when primary key is not in linear or starts at the first field
 -- https://bugs.launchpad.net/tarantool/+bug/1042798
 --
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 ---
 ...
 tmp = space:create_index('primary', { type = 'tree', parts = {3, 'num', 2, 'num'}, unique = true })
@@ -899,7 +899,7 @@ space:drop()
 dofile('index_random_test.lua')
 ---
 ...
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 ---
 ...
 tmp = space:create_index('primary', { type = 'tree', parts = {1, 'num'}, unique = true })
diff --git a/test/big/lua.test.lua b/test/big/lua.test.lua
index 400d403d53..a6483c37c9 100644
--- a/test/big/lua.test.lua
+++ b/test/big/lua.test.lua
@@ -1,4 +1,4 @@
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 tmp = space:create_index('primary', { type = 'hash', parts = {1, 'str'}, unique = true })
 tmp = space:create_index('minmax', { type = 'tree', parts = {2, 'str', 3, 'str'}, unique = true })
 
@@ -45,7 +45,7 @@ space:drop()
 --
 -- Check range scan over multipart keys
 --
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 tmp = space:create_index('primary', { type = 'hash', parts = {1, 'num'}, unique = true })
 tmp = space:create_index('minmax', { type = 'tree', parts = {2, 'str', 3, 'str'}, unique = false })
 
@@ -67,7 +67,7 @@ space:drop()
 --
 -- Lua 64bit numbers support
 --
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 tmp = space:create_index('primary', { type  = 'tree', parts = {1, 'num'}, unique = true })
 
 space:insert{tonumber64('18446744073709551615'), 'magic'}
@@ -107,7 +107,7 @@ space:drop()
 --
 -- lua select_reverse_range() testing
 -- https://blueprints.launchpad.net/tarantool/+spec/backward-tree-index-iterator
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 tmp = space:create_index('primary', { type = 'tree', parts = {1, 'num'}, unique = true })
 tmp = space:create_index('range', { type = 'tree', parts = {2, 'num', 1, 'num'}, unique = true })
 
@@ -129,7 +129,7 @@ space:drop()
 --
 -- Tests for box.index iterators
 --
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 tmp = space:create_index('primary', { type = 'tree', parts = {1, 'str'}, unique = true })
 tmp = space:create_index('i1', { type = 'tree', parts = {2, 'str', 3, 'str'}, unique = true })
 
@@ -177,7 +177,7 @@ space:drop()
 -- Tests for lua idx:count()
 --
 -- https://blueprints.launchpad.net/tarantool/+spec/lua-builtin-size-of-subtree
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 tmp = space:create_index('primary', { type = 'hash', parts = {1, 'num'}, unique = true })
 tmp = space:create_index('i1', { type = 'tree', parts = {2, 'num', 3, 'num'}, unique = false })
 space:insert{1, 1, 1}
@@ -209,7 +209,7 @@ space:drop()
 --
 -- Tests for lua tuple:transform()
 --
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 tmp = space:create_index('primary', { type = 'hash', parts = {1, 'str'}, unique = true })
 t = space:insert{'1', '2', '3', '4', '5', '6', '7'}
 t:transform(8, 0, '8', '9', '100')
@@ -275,7 +275,7 @@ space:drop()
 --  https://bugs.launchpad.net/tarantool/+bug/1006354
 --  lua box.auto_increment() testing
 
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 tmp = space:create_index('primary', { type = 'tree', parts = {1, 'num'}, unique = true })
 dofile('push.lua')
 
@@ -309,7 +309,7 @@ space:drop()
 -- Truncate hangs when primary key is not in linear or starts at the first field
 -- https://bugs.launchpad.net/tarantool/+bug/1042798
 --
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 tmp = space:create_index('primary', { type = 'tree', parts = {3, 'num', 2, 'num'}, unique = true })
 
 -- Print key fields in pk
@@ -330,7 +330,7 @@ space:drop()
 -- index:random test
 -- 
 dofile('index_random_test.lua')
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 tmp = space:create_index('primary', { type = 'tree', parts = {1, 'num'}, unique = true })
 tmp = space:create_index('secondary', { type = 'hash', parts = {1, 'num'}, unique = true })
 -------------------------------------------------------------------------------
diff --git a/test/big/sql.result b/test/big/sql.result
index 3124b00954..617fb7e63d 100644
--- a/test/big/sql.result
+++ b/test/big/sql.result
@@ -4,7 +4,7 @@ box.schema.user.create('test', { password = 'test' })
 box.schema.user.grant('test', 'execute,read,write', 'universe')
 ---
 ...
-s = box.schema.create_space('tweedledum', { id = 0 })
+s = box.schema.space.create('tweedledum', { id = 0 })
 ---
 ...
 index1 = s:create_index('primary', { type = 'tree', parts = { 1, 'str'} })
diff --git a/test/big/sql.test.py b/test/big/sql.test.py
index f462216a91..8b93e14d63 100644
--- a/test/big/sql.test.py
+++ b/test/big/sql.test.py
@@ -5,7 +5,7 @@ sql.sort = True
 #
 admin("box.schema.user.create('test', { password = 'test' })")
 admin("box.schema.user.grant('test', 'execute,read,write', 'universe')")
-admin("s = box.schema.create_space('tweedledum', { id = 0 })")
+admin("s = box.schema.space.create('tweedledum', { id = 0 })")
 admin("index1 = s:create_index('primary', { type = 'tree', parts = { 1, 'str'} })")
 admin("index2 = s:create_index('secondary', { type = 'tree', unique = false, parts = {2, 'str'}})")
 
diff --git a/test/big/tree_pk.result b/test/big/tree_pk.result
index cd9e59191f..b4979a34ce 100644
--- a/test/big/tree_pk.result
+++ b/test/big/tree_pk.result
@@ -1,7 +1,7 @@
 dofile('utils.lua')
 ---
 ...
-s0 = box.schema.create_space('tweedledum')
+s0 = box.schema.space.create('tweedledum')
 ---
 ...
 i0 = s0:create_index('primary', { type = 'tree', parts = {1, 'num'}, unique = true })
@@ -67,13 +67,13 @@ s0:insert{'12'}
 ---
 - error: 'Tuple field 0 type does not match one required by operation: expected NUM'
 ...
-s1 = box.schema.create_space('tweedledee')
+s1 = box.schema.space.create('tweedledee')
 ---
 ...
 i1 = s1:create_index('primary', { type = 'tree', parts = {1, 'str'}, unique = true })
 ---
 ...
-s2 = box.schema.create_space('alice')
+s2 = box.schema.space.create('alice')
 ---
 ...
 i2 = s2:create_index('primary', { type = 'tree', parts = {1, 'str'}, unique = true })
diff --git a/test/big/tree_pk.test.lua b/test/big/tree_pk.test.lua
index 1afdcf3886..fc48c6f7e7 100644
--- a/test/big/tree_pk.test.lua
+++ b/test/big/tree_pk.test.lua
@@ -1,6 +1,6 @@
 dofile('utils.lua')
 
-s0 = box.schema.create_space('tweedledum')
+s0 = box.schema.space.create('tweedledum')
 i0 = s0:create_index('primary', { type = 'tree', parts = {1, 'num'}, unique = true })
 
 -- integer keys
@@ -25,10 +25,10 @@ s0:insert{'xxxxxxx'}
 s0:insert{''}
 s0:insert{'12'}
 
-s1 = box.schema.create_space('tweedledee')
+s1 = box.schema.space.create('tweedledee')
 i1 = s1:create_index('primary', { type = 'tree', parts = {1, 'str'}, unique = true })
 
-s2 = box.schema.create_space('alice')
+s2 = box.schema.space.create('alice')
 i2 = s2:create_index('primary', { type = 'tree', parts = {1, 'str'}, unique = true })
 
 -- string keys
diff --git a/test/big/tree_pk_multipart.result b/test/big/tree_pk_multipart.result
index db13b38257..ab094e3899 100644
--- a/test/big/tree_pk_multipart.result
+++ b/test/big/tree_pk_multipart.result
@@ -1,7 +1,7 @@
 --
 -- Insert test
 --
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 ---
 ...
 -- Multipart primary key (sender nickname, receiver nickname, message id)
@@ -462,7 +462,7 @@ space = nil
 ...
 -- Bug #1082356
 -- Space #19, https://bugs.launchpad.net/tarantool/+bug/1082356
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 ---
 ...
 -- Multipart primary key (sender nickname, receiver nickname, message id)
diff --git a/test/big/tree_pk_multipart.test.lua b/test/big/tree_pk_multipart.test.lua
index 3caae7512a..84746fc8d5 100644
--- a/test/big/tree_pk_multipart.test.lua
+++ b/test/big/tree_pk_multipart.test.lua
@@ -1,7 +1,7 @@
 --
 -- Insert test
 --
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 -- Multipart primary key (sender nickname, receiver nickname, message id)
 i1 = space:create_index('primary', { type = 'tree', parts = {1, 'str', 2, 'str', 3, 'num'}, unique = true })
 
@@ -159,7 +159,7 @@ space = nil
 -- Bug #1082356
 -- Space #19, https://bugs.launchpad.net/tarantool/+bug/1082356
 
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 -- Multipart primary key (sender nickname, receiver nickname, message id)
 i1 = space:create_index('primary', { type = 'tree', parts = {1, 'num', 3, 'num'}, unique = true })
 
diff --git a/test/big/tree_variants.result b/test/big/tree_variants.result
index 6d6c8f8d87..38a773653e 100644
--- a/test/big/tree_variants.result
+++ b/test/big/tree_variants.result
@@ -1,4 +1,4 @@
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 ---
 ...
 i0 = space:create_index('primary', { type = 'tree', parts = {1, 'num'}, unique = true })
diff --git a/test/big/tree_variants.test.lua b/test/big/tree_variants.test.lua
index 94e98d955c..58a946ba67 100644
--- a/test/big/tree_variants.test.lua
+++ b/test/big/tree_variants.test.lua
@@ -1,4 +1,4 @@
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 i0 = space:create_index('primary', { type = 'tree', parts = {1, 'num'}, unique = true })
 i1 = space:create_index('i1', { type = 'tree', parts = {2, 'num'}, unique = false })
 i2 = space:create_index('i2', { type = 'tree', parts = {3, 'num'}, unique = false })
diff --git a/test/box/access.result b/test/box/access.result
index de2a8ba082..df27752714 100644
--- a/test/box/access.result
+++ b/test/box/access.result
@@ -44,7 +44,7 @@ session.su('test')
 -- you can't create spaces unless you have a write access on
 -- system space _space
 -- in future we may  introduce a separate privilege
-box.schema.create_space('test')
+box.schema.space.create('test')
 ---
 - error: Write access denied for user 'test' to space '_schema'
 ...
@@ -243,7 +243,7 @@ c:close()
 box.schema.user.create('testus')
 ---
 ...
-s = box.schema.create_space('admin_space')
+s = box.schema.space.create('admin_space')
 ---
 ...
 index = s:create_index('primary', {type = 'hash', parts = {1, 'NUM'}})
@@ -280,7 +280,7 @@ box.schema.user.grant('uniuser', 'read, write, execute', 'universe')
 session.su('uniuser')
 ---
 ...
-us = box.schema.create_space('uniuser_space')
+us = box.schema.space.create('uniuser_space')
 ---
 ...
 session.su('admin')
@@ -515,7 +515,7 @@ box.schema.user.grant('twostep', 'read,write,execute', 'universe')
 box.session.su('twostep')
 ---
 ...
-twostep = box.schema.create_space('twostep')
+twostep = box.schema.space.create('twostep')
 ---
 ...
 index2 = twostep:create_index('primary')
diff --git a/test/box/access.test.lua b/test/box/access.test.lua
index c71c6b65fc..2700b7e5be 100644
--- a/test/box/access.test.lua
+++ b/test/box/access.test.lua
@@ -21,7 +21,7 @@ session.su('test')
 -- you can't create spaces unless you have a write access on
 -- system space _space
 -- in future we may  introduce a separate privilege
-box.schema.create_space('test')
+box.schema.space.create('test')
 -- su() goes through because called from admin
 -- console, and it has no access checks
 -- for functions
@@ -107,7 +107,7 @@ c:close()
 -- Dropping a space recursively drops all grants - it's possible to 
 -- restore from a snapshot
 box.schema.user.create('testus')
-s = box.schema.create_space('admin_space')
+s = box.schema.space.create('admin_space')
 index = s:create_index('primary', {type = 'hash', parts = {1, 'NUM'}})
 box.schema.user.grant('testus', 'write', 'space', 'admin_space')
 s:drop()
@@ -123,7 +123,7 @@ session = box.session
 box.schema.user.create('uniuser')
 box.schema.user.grant('uniuser', 'read, write, execute', 'universe')
 session.su('uniuser')
-us = box.schema.create_space('uniuser_space')
+us = box.schema.space.create('uniuser_space')
 session.su('admin')
 box.schema.user.drop('uniuser')
 -- ------------------------------------------------------------
@@ -211,7 +211,7 @@ session = nil
 box.schema.user.create('twostep')
 box.schema.user.grant('twostep', 'read,write,execute', 'universe')
 box.session.su('twostep')
-twostep = box.schema.create_space('twostep')
+twostep = box.schema.space.create('twostep')
 index2 = twostep:create_index('primary')
 box.schema.func.create('test')
 box.session.su('admin')
diff --git a/test/box/access_misc.result b/test/box/access_misc.result
index 8419c198ef..5147e96cc6 100644
--- a/test/box/access_misc.result
+++ b/test/box/access_misc.result
@@ -4,10 +4,10 @@ session = box.session
 --
 -- Check a double create space
 --
-s = box.schema.create_space('test')
+s = box.schema.space.create('test')
 ---
 ...
-s = box.schema.create_space('test')
+s = box.schema.space.create('test')
 ---
 - error: Space 'test' already exists
 ...
@@ -31,7 +31,7 @@ box.schema.user.create('testus')
 ---
 - error: User 'testus' already exists
 ...
-s = box.schema.create_space('admin_space')
+s = box.schema.space.create('admin_space')
 ---
 ...
 index = s:create_index('primary', {type = 'hash', parts = {1, 'NUM'}})
@@ -165,7 +165,7 @@ s:drop()
 ---
 - error: Read access denied for user 'guest' to space '_index'
 ...
-gs = box.schema.create_space('guest_space')
+gs = box.schema.space.create('guest_space')
 ---
 - error: Write access denied for user 'guest' to space '_schema'
 ...
@@ -224,7 +224,7 @@ box.schema.func.drop('uniuser_func')
 --
 -- Check create and drop space
 --
-us = box.schema.create_space('uniuser_space')
+us = box.schema.space.create('uniuser_space')
 ---
 ...
 us:drop()
@@ -258,7 +258,7 @@ box.space._space:select(280)
       {'name': 'field_count', 'type': 'num'}, {'name': 'flags', 'type': 'str'}, {
         'name': 'format', 'type': '*'}]]
 ...
-us = box.schema.create_space('uniuser_space')
+us = box.schema.space.create('uniuser_space')
 ---
 ...
 box.schema.func.create('uniuser_func')
@@ -415,7 +415,7 @@ box.schema.user.revoke('testuser', 'read, write, execute', 'universe')
 --
 -- Check that itertors check privileges
 --
-s = box.schema.create_space('glade') 
+s = box.schema.space.create('glade') 
 ---
 ...
 box.schema.user.grant('testuser', 'read', 'space', 'glade')
diff --git a/test/box/access_misc.test.lua b/test/box/access_misc.test.lua
index e453d79acf..4d6e81c112 100644
--- a/test/box/access_misc.test.lua
+++ b/test/box/access_misc.test.lua
@@ -2,8 +2,8 @@ session = box.session
 --
 -- Check a double create space
 --
-s = box.schema.create_space('test')
-s = box.schema.create_space('test')
+s = box.schema.space.create('test')
+s = box.schema.space.create('test')
 --
 -- Check a double drop space
 --
@@ -15,7 +15,7 @@ s:drop()
 box.schema.user.create('testus')
 box.schema.user.create('testus')
 
-s = box.schema.create_space('admin_space')
+s = box.schema.space.create('admin_space')
 index = s:create_index('primary', {type = 'hash', parts = {1, 'NUM'}})
 s:insert({1})
 s:insert({2})
@@ -66,7 +66,7 @@ s:select(1)
 s:insert({4})
 s:delete({3})
 s:drop()
-gs = box.schema.create_space('guest_space')
+gs = box.schema.space.create('guest_space')
 box.schema.func.create('guest_func')
 
 session.su('admin')
@@ -94,7 +94,7 @@ box.schema.func.drop('uniuser_func')
 --
 -- Check create and drop space
 --
-us = box.schema.create_space('uniuser_space')
+us = box.schema.space.create('uniuser_space')
 us:drop()
 --
 -- Check create and drop user
@@ -108,7 +108,7 @@ box.space.admin_space:select()
 box.space._user:select(1)
 box.space._space:select(280)
 
-us = box.schema.create_space('uniuser_space')
+us = box.schema.space.create('uniuser_space')
 box.schema.func.create('uniuser_func')
 
 session.su('admin')
@@ -173,7 +173,7 @@ box.schema.user.revoke('testuser', 'read, write, execute', 'universe')
 --
 -- Check that itertors check privileges
 --
-s = box.schema.create_space('glade') 
+s = box.schema.space.create('glade') 
 box.schema.user.grant('testuser', 'read', 'space', 'glade')
 index = s:create_index('primary', {unique = true, parts = {1, 'NUM', 2, 'STR'}})
 s:insert({1, 'A'})
diff --git a/test/box/admin.result b/test/box/admin.result
index 3458f9944a..ce03541fb1 100644
--- a/test/box/admin.result
+++ b/test/box/admin.result
@@ -1,6 +1,6 @@
 --# stop server default
 --# start server default
-space = box.schema.create_space('tweedledum', { id = 0 })
+space = box.schema.space.create('tweedledum', { id = 0 })
 ---
 ...
 index = space:create_index('primary', { type = 'hash' })
diff --git a/test/box/admin.test.lua b/test/box/admin.test.lua
index fa0dea97cd..98a4b16f6d 100644
--- a/test/box/admin.test.lua
+++ b/test/box/admin.test.lua
@@ -1,7 +1,7 @@
 --# stop server default
 --# start server default
 
-space = box.schema.create_space('tweedledum', { id = 0 })
+space = box.schema.space.create('tweedledum', { id = 0 })
 index = space:create_index('primary', { type = 'hash' })
 
 --# push filter 'listen: .*' to 'listen: <uri>'
diff --git a/test/box/alter.result b/test/box/alter.result
index 97c3dd0e26..e2a3ad5b6e 100644
--- a/test/box/alter.result
+++ b/test/box/alter.result
@@ -232,7 +232,7 @@ box.space[1000]
 --------------------------------------------------------------------------------
 -- #197: box.space.space0:len() returns an error if there is no index
 --------------------------------------------------------------------------------
-space = box.schema.create_space('gh197')
+space = box.schema.space.create('gh197')
 ---
 ...
 space:len()
@@ -253,43 +253,43 @@ space:drop()
 -- #198: names like '' and 'x.y' and 5 and 'primary ' are legal
 --------------------------------------------------------------------------------
 -- invalid identifiers
-box.schema.create_space('invalid.identifier')
+box.schema.space.create('invalid.identifier')
 ---
 - error: Invalid identifier 'invalid.identifier' (expected letters, digits or an underscore)
 ...
-box.schema.create_space('invalid identifier')
+box.schema.space.create('invalid identifier')
 ---
 - error: Invalid identifier 'invalid identifier' (expected letters, digits or an underscore)
 ...
-box.schema.create_space('primary ')
+box.schema.space.create('primary ')
 ---
 - error: Invalid identifier 'primary ' (expected letters, digits or an underscore)
 ...
-box.schema.create_space('5')
+box.schema.space.create('5')
 ---
 - error: Invalid identifier '5' (expected letters, digits or an underscore)
 ...
-box.schema.create_space('')
+box.schema.space.create('')
 ---
 - error: Invalid identifier '' (expected letters, digits or an underscore)
 ...
 -- valid identifiers
-box.schema.create_space('_Abcde'):drop()
+box.schema.space.create('_Abcde'):drop()
 ---
 ...
-box.schema.create_space('_5'):drop()
+box.schema.space.create('_5'):drop()
 ---
 ...
-box.schema.create_space('valid_identifier'):drop()
+box.schema.space.create('valid_identifier'):drop()
 ---
 ...
-box.schema.create_space('ынтыпрайзный_空間'):drop() -- unicode
+box.schema.space.create('ынтыпрайзный_空間'):drop() -- unicode
 ---
 ...
-box.schema.create_space('utf8_наше_Фсё'):drop() -- unicode
+box.schema.space.create('utf8_наше_Фсё'):drop() -- unicode
 ---
 ...
-space = box.schema.create_space('test')
+space = box.schema.space.create('test')
 ---
 ...
 -- invalid identifiers
@@ -318,10 +318,10 @@ space:drop()
 ...
 -- gh-57 Confusing error message when trying to create space with a
 -- duplicate id
-auto = box.schema.create_space('auto_original')
+auto = box.schema.space.create('auto_original')
 ---
 ...
-auto2 = box.schema.create_space('auto', {id = auto.id})
+auto2 = box.schema.space.create('auto', {id = auto.id})
 ---
 - error: Duplicate key exists in unique index 'primary'
 ...
@@ -333,7 +333,7 @@ auto2
 ---
 - null
 ...
-box.schema.create_space('auto_original', {id = auto.id})
+box.schema.space.create('auto_original', {id = auto.id})
 ---
 - error: Space 'auto_original' already exists
 ...
@@ -343,7 +343,7 @@ auto:drop()
 -- ------------------------------------------------------------------
 -- gh-281 Crash after rename + replace + delete with multi-part index
 -- ------------------------------------------------------------------
-s = box.schema.create_space('space')
+s = box.schema.space.create('space')
 ---
 ...
 index = s:create_index('primary', {unique = true, parts = {1, 'NUM', 2, 'STR'}})
@@ -374,19 +374,19 @@ s:drop()
 -- ------------------------------------------------------------------
 -- gh-362 Appropriate error messages in create_index
 -- ------------------------------------------------------------------
-s = box.schema.create_space(42)
+s = box.schema.space.create(42)
 ---
 - error: Illegal parameters, name should be a string
 ...
-s = box.schema.create_space("test", "bug")
+s = box.schema.space.create("test", "bug")
 ---
 - error: Illegal parameters, options should be a table
 ...
-s = box.schema.create_space("test", {unknown = 'param'})
+s = box.schema.space.create("test", {unknown = 'param'})
 ---
 - error: Illegal parameters, options parameter 'unknown' is unexpected
 ...
-s = box.schema.create_space("test")
+s = box.schema.space.create("test")
 ---
 ...
 index = s:create_index('primary', {unique = true, parts = {0, 'NUM', 1, 'STR'}})
@@ -417,7 +417,7 @@ for i=1,W do
     fiber.create(function()
         for k=1,N do
             local space_id = math.random(2147483647)
-            local space = box.schema.create_space(string.format('space_%d', space_id))
+            local space = box.schema.space.create(string.format('space_%d', space_id))
             space:create_index('pk', { type = 'tree' })
             space:drop()
         end
diff --git a/test/box/alter.test.lua b/test/box/alter.test.lua
index d93b775345..e205503ad1 100644
--- a/test/box/alter.test.lua
+++ b/test/box/alter.test.lua
@@ -85,7 +85,7 @@ box.space[1000]
 -- #197: box.space.space0:len() returns an error if there is no index
 --------------------------------------------------------------------------------
 
-space = box.schema.create_space('gh197')
+space = box.schema.space.create('gh197')
 space:len()
 space:truncate()
 space:pairs():totable()
@@ -96,20 +96,20 @@ space:drop()
 --------------------------------------------------------------------------------
 
 -- invalid identifiers
-box.schema.create_space('invalid.identifier')
-box.schema.create_space('invalid identifier')
-box.schema.create_space('primary ')
-box.schema.create_space('5')
-box.schema.create_space('')
+box.schema.space.create('invalid.identifier')
+box.schema.space.create('invalid identifier')
+box.schema.space.create('primary ')
+box.schema.space.create('5')
+box.schema.space.create('')
 
 -- valid identifiers
-box.schema.create_space('_Abcde'):drop()
-box.schema.create_space('_5'):drop()
-box.schema.create_space('valid_identifier'):drop()
-box.schema.create_space('ынтыпрайзный_空間'):drop() -- unicode
-box.schema.create_space('utf8_наше_Фсё'):drop() -- unicode
+box.schema.space.create('_Abcde'):drop()
+box.schema.space.create('_5'):drop()
+box.schema.space.create('valid_identifier'):drop()
+box.schema.space.create('ынтыпрайзный_空間'):drop() -- unicode
+box.schema.space.create('utf8_наше_Фсё'):drop() -- unicode
 
-space = box.schema.create_space('test')
+space = box.schema.space.create('test')
 
 -- invalid identifiers
 space:create_index('invalid.identifier')
@@ -121,17 +121,17 @@ space:create_index('')
 space:drop()
 -- gh-57 Confusing error message when trying to create space with a
 -- duplicate id
-auto = box.schema.create_space('auto_original')
-auto2 = box.schema.create_space('auto', {id = auto.id})
+auto = box.schema.space.create('auto_original')
+auto2 = box.schema.space.create('auto', {id = auto.id})
 box.schema.space.drop('auto')
 auto2
-box.schema.create_space('auto_original', {id = auto.id})
+box.schema.space.create('auto_original', {id = auto.id})
 auto:drop()
 
 -- ------------------------------------------------------------------
 -- gh-281 Crash after rename + replace + delete with multi-part index
 -- ------------------------------------------------------------------
-s = box.schema.create_space('space')
+s = box.schema.space.create('space')
 index = s:create_index('primary', {unique = true, parts = {1, 'NUM', 2, 'STR'}})
 s:insert{1, 'a'}
 box.space.space.index.primary:rename('secondary')
@@ -143,10 +143,10 @@ s:drop()
 -- ------------------------------------------------------------------
 -- gh-362 Appropriate error messages in create_index
 -- ------------------------------------------------------------------
-s = box.schema.create_space(42)
-s = box.schema.create_space("test", "bug")
-s = box.schema.create_space("test", {unknown = 'param'})
-s = box.schema.create_space("test")
+s = box.schema.space.create(42)
+s = box.schema.space.create("test", "bug")
+s = box.schema.space.create("test", {unknown = 'param'})
+s = box.schema.space.create("test")
 index = s:create_index('primary', {unique = true, parts = {0, 'NUM', 1, 'STR'}})
 index = s:create_index('primary', {unique = true, parts = {'NUM', 1, 'STR', 2}})
 index = s:create_index('primary', {unique = true, parts = 'bug'})
@@ -166,7 +166,7 @@ for i=1,W do
     fiber.create(function()
         for k=1,N do
             local space_id = math.random(2147483647)
-            local space = box.schema.create_space(string.format('space_%d', space_id))
+            local space = box.schema.space.create(string.format('space_%d', space_id))
             space:create_index('pk', { type = 'tree' })
             space:drop()
         end
diff --git a/test/box/alter_limits.result b/test/box/alter_limits.result
index 3736290ea5..3ba3ff295f 100644
--- a/test/box/alter_limits.result
+++ b/test/box/alter_limits.result
@@ -48,16 +48,16 @@ box.schema.FORMAT_ID_MAX
 -- ----------------------------------------------------------------
 -- CREATE SPACE
 -- ----------------------------------------------------------------
-s = box.schema.create_space('tweedledum')
+s = box.schema.space.create('tweedledum')
 ---
 ...
 -- space already exists
-box.schema.create_space('tweedledum')
+box.schema.space.create('tweedledum')
 ---
 - error: Space 'tweedledum' already exists
 ...
 -- create if not exists
-s = box.schema.create_space('tweedledum', { if_not_exists = true })
+s = box.schema.space.create('tweedledum', { if_not_exists = true })
 ---
 ...
 s:drop()
@@ -69,12 +69,12 @@ s:drop()
 - error: Space 'tweedledum' does not exist
 ...
 -- no such engine
-box.schema.create_space('tweedleedee', { engine = 'unknown' })
+box.schema.space.create('tweedleedee', { engine = 'unknown' })
 ---
 - error: Space engine 'unknown' does not exist
 ...
 -- explicit space id
-s = box.schema.create_space('tweedledum', { id = 3000 })
+s = box.schema.space.create('tweedledum', { id = 3000 })
 ---
 ...
 s.id
@@ -82,12 +82,12 @@ s.id
 - 3000
 ...
 -- duplicate id
-box.schema.create_space('tweedledee', { id = 3000 })
+box.schema.space.create('tweedledee', { id = 3000 })
 ---
 - error: Duplicate key exists in unique index 'primary'
 ...
 -- stupid space id
-box.schema.create_space('tweedledee', { id = 'tweedledee' })
+box.schema.space.create('tweedledee', { id = 'tweedledee' })
 ---
 - error: Illegal parameters, options parameter 'id' should be of type number
 ...
@@ -95,23 +95,23 @@ s:drop()
 ---
 ...
 -- too long space name
-box.schema.create_space(string.rep('tweedledee', 100))
+box.schema.space.create(string.rep('tweedledee', 100))
 ---
 - error: 'Failed to create space ''tweedledeetweedledeetweedledeetw'': space name
     is too long'
 ...
 -- too long space engine name
-box.schema.create_space('tweedleedee', { engine = string.rep('too-long', 100) })
+box.schema.space.create('tweedleedee', { engine = string.rep('too-long', 100) })
 ---
 - error: 'Failed to create space ''tweedleedee'': space engine name is too long'
 ...
 -- space name limit
-box.schema.create_space(string.rep('t', box.schema.NAME_MAX)..'_')
+box.schema.space.create(string.rep('t', box.schema.NAME_MAX)..'_')
 ---
 - error: 'Failed to create space ''tttttttttttttttttttttttttttttttt'': space name
     is too long'
 ...
-s = box.schema.create_space(string.rep('t', box.schema.NAME_MAX - 1)..'_')
+s = box.schema.space.create(string.rep('t', box.schema.NAME_MAX - 1)..'_')
 ---
 ...
 s.name
@@ -121,7 +121,7 @@ s.name
 s:drop()
 ---
 ...
-s = box.schema.create_space(string.rep('t', box.schema.NAME_MAX - 2)..'_')
+s = box.schema.space.create(string.rep('t', box.schema.NAME_MAX - 2)..'_')
 ---
 ...
 s.name
@@ -132,7 +132,7 @@ s:drop()
 ---
 ...
 -- space with no indexes - test update, delete, select, truncate
-s = box.schema.create_space('tweedledum')
+s = box.schema.space.create('tweedledum')
 ---
 ...
 s:insert{0}
@@ -219,7 +219,7 @@ s:drop()
 ---
 ...
 -- create a space with reserved id (ok, but warns in the log)
-s = box.schema.create_space('test', { id = 256 })
+s = box.schema.space.create('test', { id = 256 })
 ---
 ...
 s.id
@@ -229,7 +229,7 @@ s.id
 s:drop()
 ---
 ...
-s = box.schema.create_space('test', { field_count = 2 })
+s = box.schema.space.create('test', { field_count = 2 })
 ---
 ...
 s.field_count
@@ -352,7 +352,7 @@ s:drop()
 -- CREATE INDEX
 -- ----------------------------------------------------------------
 --
-s = box.schema.create_space('test')
+s = box.schema.space.create('test')
 ---
 ...
 --# setopt delimiter ';'
@@ -443,7 +443,7 @@ index = s:create_index('t2', { type = 'hash', parts = { box.schema.INDEX_FIELD_M
 s:drop()
 ---
 ...
-s = box.schema.create_space('test')
+s = box.schema.space.create('test')
 ---
 ...
 -- same part can't be indexed twice
@@ -499,7 +499,7 @@ s:drop()
 ---
 ...
 -- check costraints in tuple_format_new()
-s = box.schema.create_space('test')
+s = box.schema.space.create('test')
 ---
 ...
 index = s:create_index('t1', { type = 'hash' })
@@ -525,7 +525,7 @@ s:drop()
 ---
 ...
 -- index name, name manipulation
-s = box.schema.create_space('test')
+s = box.schema.space.create('test')
 ---
 ...
 index = s:create_index('primary', { type = 'hash' })
@@ -624,7 +624,7 @@ s:drop()
 ---
 ...
 -- modify index
-s = box.schema.create_space('test')
+s = box.schema.space.create('test')
 ---
 ...
 index = s:create_index('primary', { type = 'hash' })
@@ -711,7 +711,7 @@ s:drop()
 -- ----------------------------------------------------------------
 -- BUILD INDEX: changes of a non-empty index
 -- ----------------------------------------------------------------
-s = box.schema.create_space('full')
+s = box.schema.space.create('full')
 ---
 ...
 index = s:create_index('primary', { type = 'tree', parts =  { 1, 'str' }})
@@ -818,7 +818,7 @@ s:drop()
 ---
 ...
 -- unique -> non-unique transition
-s = box.schema.create_space('test')
+s = box.schema.space.create('test')
 ---
 ...
 -- primary key must be unique
@@ -874,7 +874,7 @@ s:drop()
 -- ----------------------------------------------------------------
 -- SPACE CACHE: what happens to a space cache when an object is gone
 -- ----------------------------------------------------------------
-s = box.schema.create_space('test')
+s = box.schema.space.create('test')
 ---
 ...
 s1 = s
@@ -912,7 +912,7 @@ s:drop()
 -- during recovery regardless of when they are created
 -- ----------------------------------------------------------------
 -- primary, secondary keys in a snapshot
-s_empty = box.schema.create_space('s_empty')
+s_empty = box.schema.space.create('s_empty')
 ---
 ...
 indexe1 = s_empty:create_index('primary')
@@ -921,7 +921,7 @@ indexe1 = s_empty:create_index('primary')
 indexe2 = s_empty:create_index('secondary', { type = 'hash', unique = true, parts = {2, 'num'}})
 ---
 ...
-s_full = box.schema.create_space('s_full')
+s_full = box.schema.space.create('s_full')
 ---
 ...
 indexf1 = s_full:create_index('primary')
@@ -950,10 +950,10 @@ s_full:insert{5, 5, 'e'}
 ---
 - [5, 5, 'e']
 ...
-s_nil = box.schema.create_space('s_nil')
+s_nil = box.schema.space.create('s_nil')
 ---
 ...
-s_drop = box.schema.create_space('s_drop')
+s_drop = box.schema.space.create('s_drop')
 ---
 ...
 box.snapshot()
@@ -981,7 +981,7 @@ s_nil:insert{13, 14, 15, 16, 17}
 ---
 - [13, 14, 15, 16, 17]
 ...
-r_empty = box.schema.create_space('r_empty')
+r_empty = box.schema.space.create('r_empty')
 ---
 ...
 indexe1 = r_empty:create_index('primary')
@@ -990,7 +990,7 @@ indexe1 = r_empty:create_index('primary')
 indexe2 = r_empty:create_index('secondary', { type = 'hash', unique = true, parts = {2, 'num'}})
 ---
 ...
-r_full = box.schema.create_space('r_full')
+r_full = box.schema.space.create('r_full')
 ---
 ...
 indexf1 = r_full:create_index('primary', { type = 'tree', unique = true, parts = {1, 'num'}})
@@ -1034,7 +1034,7 @@ s_full:insert{8, 8, 'h'}
 ---
 - [8, 8, 'h']
 ...
-r_disabled = box.schema.create_space('r_disabled')
+r_disabled = box.schema.space.create('r_disabled')
 ---
 ...
 --# stop server default
diff --git a/test/box/alter_limits.test.lua b/test/box/alter_limits.test.lua
index 065c4bfd31..2ba85295a6 100644
--- a/test/box/alter_limits.test.lua
+++ b/test/box/alter_limits.test.lua
@@ -16,39 +16,39 @@ box.schema.FORMAT_ID_MAX
 -- CREATE SPACE
 -- ----------------------------------------------------------------
 
-s = box.schema.create_space('tweedledum')
+s = box.schema.space.create('tweedledum')
 -- space already exists
-box.schema.create_space('tweedledum')
+box.schema.space.create('tweedledum')
 -- create if not exists
-s = box.schema.create_space('tweedledum', { if_not_exists = true })
+s = box.schema.space.create('tweedledum', { if_not_exists = true })
 
 s:drop()
 -- no such space
 s:drop()
 -- no such engine
-box.schema.create_space('tweedleedee', { engine = 'unknown' })
+box.schema.space.create('tweedleedee', { engine = 'unknown' })
 -- explicit space id
-s = box.schema.create_space('tweedledum', { id = 3000 })
+s = box.schema.space.create('tweedledum', { id = 3000 })
 s.id
 -- duplicate id
-box.schema.create_space('tweedledee', { id = 3000 })
+box.schema.space.create('tweedledee', { id = 3000 })
 -- stupid space id
-box.schema.create_space('tweedledee', { id = 'tweedledee' })
+box.schema.space.create('tweedledee', { id = 'tweedledee' })
 s:drop()
 -- too long space name
-box.schema.create_space(string.rep('tweedledee', 100))
+box.schema.space.create(string.rep('tweedledee', 100))
 -- too long space engine name
-box.schema.create_space('tweedleedee', { engine = string.rep('too-long', 100) })
+box.schema.space.create('tweedleedee', { engine = string.rep('too-long', 100) })
 -- space name limit
-box.schema.create_space(string.rep('t', box.schema.NAME_MAX)..'_')
-s = box.schema.create_space(string.rep('t', box.schema.NAME_MAX - 1)..'_')
+box.schema.space.create(string.rep('t', box.schema.NAME_MAX)..'_')
+s = box.schema.space.create(string.rep('t', box.schema.NAME_MAX - 1)..'_')
 s.name
 s:drop()
-s = box.schema.create_space(string.rep('t', box.schema.NAME_MAX - 2)..'_')
+s = box.schema.space.create(string.rep('t', box.schema.NAME_MAX - 2)..'_')
 s.name
 s:drop()
 -- space with no indexes - test update, delete, select, truncate
-s = box.schema.create_space('tweedledum')
+s = box.schema.space.create('tweedledum')
 s:insert{0}
 s:select{}
 s:delete{0}
@@ -77,10 +77,10 @@ s:delete{0}
 -- cleanup
 s:drop()
 -- create a space with reserved id (ok, but warns in the log)
-s = box.schema.create_space('test', { id = 256 })
+s = box.schema.space.create('test', { id = 256 })
 s.id
 s:drop()
-s = box.schema.create_space('test', { field_count = 2 })
+s = box.schema.space.create('test', { field_count = 2 })
 s.field_count
 index = s:create_index('primary')
 -- field_count actually works
@@ -125,7 +125,7 @@ s:drop()
 -- CREATE INDEX
 -- ----------------------------------------------------------------
 --
-s = box.schema.create_space('test')
+s = box.schema.space.create('test')
 --# setopt delimiter ';'
 for k=1, box.schema.INDEX_MAX, 1 do
     index = s:create_index('i'..k, { type = 'hash' })
@@ -159,7 +159,7 @@ index = s:create_index('t1', { type = 'hash', parts = { box.schema.INDEX_FIELD_M
 index = s:create_index('t2', { type = 'hash', parts = { box.schema.INDEX_FIELD_MAX - 1, 'num' }})
 -- cleanup
 s:drop()
-s = box.schema.create_space('test')
+s = box.schema.space.create('test')
 -- same part can't be indexed twice
 index = s:create_index('t1', { type = 'hash', parts = { 1, 'num', 1, 'str' }})
 -- a lot of key parts
@@ -185,7 +185,7 @@ index = s:create_index('t1', { type = 'hash', parts = parts});
 -- cleanup
 s:drop()
 -- check costraints in tuple_format_new()
-s = box.schema.create_space('test')
+s = box.schema.space.create('test')
 index = s:create_index('t1', { type = 'hash' })
 -- field type contradicts field type of another index
 index = s:create_index('t2', { type = 'hash', parts = { 1, 'str' }})
@@ -196,7 +196,7 @@ s.index[0]:drop()
 -- cleanup
 s:drop()
 -- index name, name manipulation
-s = box.schema.create_space('test')
+s = box.schema.space.create('test')
 index = s:create_index('primary', { type = 'hash' })
 -- space cache is updated correctly
 s.index[0].name
@@ -226,7 +226,7 @@ s.index.primary.name
 -- cleanup
 s:drop()
 -- modify index
-s = box.schema.create_space('test')
+s = box.schema.space.create('test')
 index = s:create_index('primary', { type = 'hash' })
 -- correct error on misuse of alter
 s.index.primary.alter({unique=false})
@@ -252,7 +252,7 @@ s:drop()
 -- ----------------------------------------------------------------
 -- BUILD INDEX: changes of a non-empty index
 -- ----------------------------------------------------------------
-s = box.schema.create_space('full')
+s = box.schema.space.create('full')
 index = s:create_index('primary', { type = 'tree', parts =  { 1, 'str' }})
 s:insert{'No such movie', 999}
 s:insert{'Barbara', 2012}
@@ -283,7 +283,7 @@ s:replace{'Der Baader Meinhof Komplex'}
 index = s:create_index('year', { type = 'tree', unique = false, parts = { 2, 'num'}})
 s:drop()
 -- unique -> non-unique transition
-s = box.schema.create_space('test')
+s = box.schema.space.create('test')
 -- primary key must be unique
 index = s:create_index('primary', { unique = false })
 -- create primary key
@@ -302,7 +302,7 @@ s:drop()
 -- ----------------------------------------------------------------
 -- SPACE CACHE: what happens to a space cache when an object is gone
 -- ----------------------------------------------------------------
-s = box.schema.create_space('test')
+s = box.schema.space.create('test')
 s1 = s
 index = s:create_index('primary')
 s1.index.primary.id
@@ -319,11 +319,11 @@ s:drop()
 -- during recovery regardless of when they are created
 -- ----------------------------------------------------------------
 -- primary, secondary keys in a snapshot
-s_empty = box.schema.create_space('s_empty')
+s_empty = box.schema.space.create('s_empty')
 indexe1 = s_empty:create_index('primary')
 indexe2 = s_empty:create_index('secondary', { type = 'hash', unique = true, parts = {2, 'num'}})
 
-s_full = box.schema.create_space('s_full')
+s_full = box.schema.space.create('s_full')
 indexf1 = s_full:create_index('primary')
 indexf2 = s_full:create_index('secondary', { type = 'hash', unique = true, parts = {2, 'num'}})
 
@@ -333,9 +333,9 @@ s_full:insert{3, 3, 'c'}
 s_full:insert{4, 4, 'd'}
 s_full:insert{5, 5, 'e'}
 
-s_nil = box.schema.create_space('s_nil')
+s_nil = box.schema.space.create('s_nil')
 
-s_drop = box.schema.create_space('s_drop')
+s_drop = box.schema.space.create('s_drop')
 
 box.snapshot()
 
@@ -347,11 +347,11 @@ s_nil:insert{7, 8, 9, 10, 11,12}
 indexn2 = s_nil:create_index('secondary', { type = 'tree', unique=false, parts = {2, 'num', 3, 'num', 4, 'num'}})
 s_nil:insert{13, 14, 15, 16, 17}
 
-r_empty = box.schema.create_space('r_empty')
+r_empty = box.schema.space.create('r_empty')
 indexe1 = r_empty:create_index('primary')
 indexe2 = r_empty:create_index('secondary', { type = 'hash', unique = true, parts = {2, 'num'}})
 
-r_full = box.schema.create_space('r_full')
+r_full = box.schema.space.create('r_full')
 indexf1 = r_full:create_index('primary', { type = 'tree', unique = true, parts = {1, 'num'}})
 indexf2 = r_full:create_index('secondary', { type = 'hash', unique = true, parts = {2, 'num'}})
 
@@ -366,7 +366,7 @@ s_full:insert{6, 6, 'f'}
 s_full:insert{7, 7, 'g'}
 s_full:insert{8, 8, 'h'}
 
-r_disabled = box.schema.create_space('r_disabled')
+r_disabled = box.schema.space.create('r_disabled')
 
 --# stop server default
 --# start server default
diff --git a/test/box/call.result b/test/box/call.result
index 59e20e55f5..70928be522 100644
--- a/test/box/call.result
+++ b/test/box/call.result
@@ -183,7 +183,7 @@ call f1('jason', 1, 'test', 2, 'stewart')
 ---
 - ['jason', 1, 'test', 2, 'stewart']
 ...
-space = box.schema.create_space('tweedledum', { id = 0 })
+space = box.schema.space.create('tweedledum', { id = 0 })
 ---
 ...
 index = space:create_index('primary', { type = 'hash' })
@@ -375,7 +375,7 @@ call space:delete(4)
 space:drop()
 ---
 ...
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 ---
 ...
 index = space:create_index('primary', { type = 'tree' })
diff --git a/test/box/call.test.py b/test/box/call.test.py
index ef352f2ab0..7d64899a6a 100644
--- a/test/box/call.test.py
+++ b/test/box/call.test.py
@@ -68,7 +68,7 @@ sql("call f3()")
 sql("call f1('jason')")
 sql("call f1('jason', 1, 'test', 2, 'stewart')")
 
-admin("space = box.schema.create_space('tweedledum', { id = 0 })")
+admin("space = box.schema.space.create('tweedledum', { id = 0 })")
 admin("index = space:create_index('primary', { type = 'hash' })")
 
 admin("function myreplace(...) return space:replace{...} end")
@@ -122,7 +122,7 @@ sql("call field_x(4, 2)")
 sql("call space:delete(4)")
 admin("space:drop()")
 
-admin("space = box.schema.create_space('tweedledum')")
+admin("space = box.schema.space.create('tweedledum')")
 admin("index = space:create_index('primary', { type = 'tree' })")
 
 
diff --git a/test/box/crossjoin.result b/test/box/crossjoin.result
index 3898aa417c..6a39def7e5 100644
--- a/test/box/crossjoin.result
+++ b/test/box/crossjoin.result
@@ -1,4 +1,4 @@
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 ---
 ...
 index = space:create_index('primary', { type = 'tree' })
diff --git a/test/box/crossjoin.test.lua b/test/box/crossjoin.test.lua
index 2c168de1be..5fc3a61c4b 100644
--- a/test/box/crossjoin.test.lua
+++ b/test/box/crossjoin.test.lua
@@ -1,4 +1,4 @@
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 index = space:create_index('primary', { type = 'tree' })
 --# setopt delimiter ';'
 function crossjoin(space0, space1, limit)
diff --git a/test/box/errinj.result b/test/box/errinj.result
index dd113ee160..bd6bca4531 100644
--- a/test/box/errinj.result
+++ b/test/box/errinj.result
@@ -1,7 +1,7 @@
 errinj = require('box.error.injection')
 ---
 ...
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 ---
 ...
 index = space:create_index('primary', { type = 'hash' })
@@ -153,16 +153,16 @@ space:drop()
 ---
 ...
 -- Check how well we handle a failed log write in DDL
-s_disabled = box.schema.create_space('disabled')
+s_disabled = box.schema.space.create('disabled')
 ---
 ...
-s_withindex = box.schema.create_space('withindex')
+s_withindex = box.schema.space.create('withindex')
 ---
 ...
 index1 = s_withindex:create_index('primary', { type = 'hash' })
 ---
 ...
-s_withdata = box.schema.create_space('withdata')
+s_withdata = box.schema.space.create('withdata')
 ---
 ...
 index2 = s_withdata:create_index('primary', { type = 'tree' })
@@ -183,7 +183,7 @@ errinj.set("ERRINJ_WAL_IO", true)
 ---
 - ok
 ...
-test = box.schema.create_space('test')
+test = box.schema.space.create('test')
 ---
 - error: Failed to write to disk
 ...
@@ -235,7 +235,7 @@ errinj.set("ERRINJ_WAL_IO", false)
 ---
 - ok
 ...
-test = box.schema.create_space('test')
+test = box.schema.space.create('test')
 ---
 ...
 index5 = s_disabled:create_index('primary', { type = 'hash' })
diff --git a/test/box/errinj.test.lua b/test/box/errinj.test.lua
index ebe60c7bee..ba4c465865 100644
--- a/test/box/errinj.test.lua
+++ b/test/box/errinj.test.lua
@@ -1,6 +1,6 @@
 errinj = require('box.error.injection')
 
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 index = space:create_index('primary', { type = 'hash' })
 
 errinj.info()
@@ -46,16 +46,16 @@ space:truncate()
 space:drop()
 
 -- Check how well we handle a failed log write in DDL
-s_disabled = box.schema.create_space('disabled')
-s_withindex = box.schema.create_space('withindex')
+s_disabled = box.schema.space.create('disabled')
+s_withindex = box.schema.space.create('withindex')
 index1 = s_withindex:create_index('primary', { type = 'hash' })
-s_withdata = box.schema.create_space('withdata')
+s_withdata = box.schema.space.create('withdata')
 index2 = s_withdata:create_index('primary', { type = 'tree' })
 s_withdata:insert{1, 2, 3, 4, 5}
 s_withdata:insert{4, 5, 6, 7, 8}
 index3 = s_withdata:create_index('secondary', { type = 'hash', parts = {2, 'num', 3, 'num' }})
 errinj.set("ERRINJ_WAL_IO", true)
-test = box.schema.create_space('test')
+test = box.schema.space.create('test')
 s_disabled:create_index('primary', { type = 'hash' })
 s_disabled.enabled
 s_disabled:insert{0}
@@ -68,7 +68,7 @@ box.space['withdata'].enabled
 index4 = s_withdata:create_index('another', { type = 'tree', parts = { 5, 'num' }, unique = false})
 s_withdata.index.another
 errinj.set("ERRINJ_WAL_IO", false)
-test = box.schema.create_space('test')
+test = box.schema.space.create('test')
 index5 = s_disabled:create_index('primary', { type = 'hash' })
 s_disabled.enabled
 s_disabled:insert{0}
diff --git a/test/box/errinj_index.result b/test/box/errinj_index.result
index c232a89b22..a7536ba883 100644
--- a/test/box/errinj_index.result
+++ b/test/box/errinj_index.result
@@ -2,7 +2,7 @@ errinj = require('box.error.injection')
 ---
 ...
 -- Check a failed realloc in tree index.
-s = box.schema.create_space('tweedledum')
+s = box.schema.space.create('tweedledum')
 ---
 ...
 index = s:create_index('primary', {type = 'tree'} )
@@ -261,7 +261,7 @@ s:drop()
 ...
 -----------------------------------
 -- Check a failed realloc in hash index.
-s = box.schema.create_space('tweedledum')
+s = box.schema.space.create('tweedledum')
 ---
 ...
 index = s:create_index('primary', {type = 'hash'} )
diff --git a/test/box/errinj_index.test.lua b/test/box/errinj_index.test.lua
index 1913b50cac..05155f261e 100644
--- a/test/box/errinj_index.test.lua
+++ b/test/box/errinj_index.test.lua
@@ -2,7 +2,7 @@ errinj = require('box.error.injection')
 
 -- Check a failed realloc in tree index.
 
-s = box.schema.create_space('tweedledum')
+s = box.schema.space.create('tweedledum')
 index = s:create_index('primary', {type = 'tree'} )
 
 for i = 1,10 do s:insert{i, i, 'test' .. i} end
@@ -69,7 +69,7 @@ s:drop()
 
 -- Check a failed realloc in hash index.
 
-s = box.schema.create_space('tweedledum')
+s = box.schema.space.create('tweedledum')
 index = s:create_index('primary', {type = 'hash'} )
 
 for i = 1,10 do s:insert{i, i, 'test' .. i} end
diff --git a/test/box/fiber.result b/test/box/fiber.result
index 79954b9a46..ca8c4b5690 100644
--- a/test/box/fiber.result
+++ b/test/box/fiber.result
@@ -1,7 +1,7 @@
 fiber = require('fiber')
 ---
 ...
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 ---
 ...
 index = space:create_index('primary', { type = 'hash' })
diff --git a/test/box/fiber.test.lua b/test/box/fiber.test.lua
index 95d8ce5eea..0632a78749 100644
--- a/test/box/fiber.test.lua
+++ b/test/box/fiber.test.lua
@@ -1,5 +1,5 @@
 fiber = require('fiber')
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 index = space:create_index('primary', { type = 'hash' })
 -- A test case for a race condition between ev_schedule
 -- and wal_schedule fiber schedulers.
diff --git a/test/box/insert.result b/test/box/insert.result
index f0d05321b1..4b3d818ae5 100644
--- a/test/box/insert.result
+++ b/test/box/insert.result
@@ -1,6 +1,6 @@
 -- gh-186 New implementation of box.replace does not check that tuple is
 -- array
-s = box.schema.create_space('s')
+s = box.schema.space.create('s')
 ---
 ...
 index = s:create_index('pk')
diff --git a/test/box/insert.test.lua b/test/box/insert.test.lua
index 5a106cf69d..b84242d749 100644
--- a/test/box/insert.test.lua
+++ b/test/box/insert.test.lua
@@ -1,6 +1,6 @@
 -- gh-186 New implementation of box.replace does not check that tuple is
 -- array
-s = box.schema.create_space('s')
+s = box.schema.space.create('s')
 index = s:create_index('pk')
 s:insert(1)
 s:insert(1, 2)
diff --git a/test/box/iproto.result b/test/box/iproto.result
index 32320bdfc8..7ed0c05d7e 100644
--- a/test/box/iproto.result
+++ b/test/box/iproto.result
@@ -73,7 +73,7 @@ box.cfg.wal_mode
 ---
 - write
 ...
-space = box.schema.create_space('test', { id = 567 })
+space = box.schema.space.create('test', { id = 567 })
 ---
 ...
 index = space:create_index('primary', { type = 'hash' })
@@ -101,7 +101,7 @@ box.schema.user.grant('guest', 'read,write,execute', 'space', 'test')
 space:drop()
 ---
 ...
-space = box.schema.create_space('test')
+space = box.schema.space.create('test')
 ---
 ...
 index = space:create_index('primary', { type = 'hash', parts = {1, 'str'}})
diff --git a/test/box/iproto.test.py b/test/box/iproto.test.py
index 688f1e0fbc..6f3248c0ab 100644
--- a/test/box/iproto.test.py
+++ b/test/box/iproto.test.py
@@ -92,7 +92,7 @@ print "\n"
 
 # gh-434 Tarantool crashes on multiple iproto requests with WAL enabled
 admin("box.cfg.wal_mode")
-admin("space = box.schema.create_space('test', { id = 567 })")
+admin("space = box.schema.space.create('test', { id = 567 })")
 admin("index = space:create_index('primary', { type = 'hash' })")
 admin("box.schema.user.grant('guest', 'read,write,execute', 'space', 'test')")
 
@@ -153,7 +153,7 @@ admin("space:drop()")
 #
 # gh-522: Broken compatibility with msgpack-python for strings of size 33..255
 #
-admin("space = box.schema.create_space('test')")
+admin("space = box.schema.space.create('test')")
 admin("index = space:create_index('primary', { type = 'hash', parts = {1, 'str'}})")
 
 class RawInsert(Request):
diff --git a/test/box/luafun.result b/test/box/luafun.result
index 295e884b3c..fcac98dedd 100644
--- a/test/box/luafun.result
+++ b/test/box/luafun.result
@@ -1,7 +1,7 @@
 --------------------------------------------------------------------------------
 -- # luafun integration
 --------------------------------------------------------------------------------
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 ---
 ...
 index = space:create_index('primary', { type = 'hash' })
diff --git a/test/box/luafun.test.lua b/test/box/luafun.test.lua
index f01bb9b3da..8ad85eabc3 100644
--- a/test/box/luafun.test.lua
+++ b/test/box/luafun.test.lua
@@ -2,7 +2,7 @@
 -- # luafun integration
 --------------------------------------------------------------------------------
 
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 index = space:create_index('primary', { type = 'hash' })
 for i = 1,5,1 do space:replace({i, i}) end
 
diff --git a/test/box/misc.result b/test/box/misc.result
index eb680b165d..46a7821f26 100644
--- a/test/box/misc.result
+++ b/test/box/misc.result
@@ -1,4 +1,4 @@
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 ---
 ...
 index = space:create_index('primary', { type = 'hash' })
diff --git a/test/box/misc.test.lua b/test/box/misc.test.lua
index 741b3fc7b1..9b04e65d97 100644
--- a/test/box/misc.test.lua
+++ b/test/box/misc.test.lua
@@ -1,4 +1,4 @@
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 index = space:create_index('primary', { type = 'hash' })
 
 -- Test Lua from admin console. Whenever producing output,
diff --git a/test/box/net.box.result b/test/box/net.box.result
index 7441f02aff..d54d106f00 100644
--- a/test/box/net.box.result
+++ b/test/box/net.box.result
@@ -13,7 +13,7 @@ msgpack = require 'msgpack'
 LISTEN = require('uri').parse(box.cfg.listen)
 ---
 ...
-space = box.schema.create_space('net_box_test_space')
+space = box.schema.space.create('net_box_test_space')
 ---
 ...
 index = space:create_index('primary', { type = 'tree' })
@@ -760,7 +760,7 @@ gh594()
 ---
 ...
 -- #636: Reload schema on demand
-sp = box.schema.create_space('test_old')
+sp = box.schema.space.create('test_old')
 ---
 ...
 _ = sp:create_index('primary')
@@ -785,7 +785,7 @@ con.space.test == nil
 ---
 - true
 ...
-sp = box.schema.create_space('test')
+sp = box.schema.space.create('test')
 ---
 ...
 _ = sp:create_index('primary')
diff --git a/test/box/net.box.test.lua b/test/box/net.box.test.lua
index 2e26f88b62..f4240d147b 100644
--- a/test/box/net.box.test.lua
+++ b/test/box/net.box.test.lua
@@ -4,7 +4,7 @@ log = require 'log'
 msgpack = require 'msgpack'
 
 LISTEN = require('uri').parse(box.cfg.listen)
-space = box.schema.create_space('net_box_test_space')
+space = box.schema.space.create('net_box_test_space')
 index = space:create_index('primary', { type = 'tree' })
 
 -- low level connection
@@ -297,7 +297,7 @@ end;
 gh594()
 
 -- #636: Reload schema on demand
-sp = box.schema.create_space('test_old')
+sp = box.schema.space.create('test_old')
 _ = sp:create_index('primary')
 sp:insert{1, 2, 3}
 
@@ -306,7 +306,7 @@ con:ping()
 con.space.test_old:select{}
 con.space.test == nil
 
-sp = box.schema.create_space('test')
+sp = box.schema.space.create('test')
 _ = sp:create_index('primary')
 sp:insert{2, 3, 4}
 
diff --git a/test/box/on_replace.result b/test/box/on_replace.result
index c5295f3750..35daaceb33 100644
--- a/test/box/on_replace.result
+++ b/test/box/on_replace.result
@@ -1,4 +1,4 @@
-ts = box.schema.create_space('test_space')
+ts = box.schema.space.create('test_space')
 ---
 ...
 ti = ts:create_index('primary', { type = 'hash' })
diff --git a/test/box/on_replace.test.lua b/test/box/on_replace.test.lua
index 78ccefb093..2ec3138c2d 100644
--- a/test/box/on_replace.test.lua
+++ b/test/box/on_replace.test.lua
@@ -1,4 +1,4 @@
-ts = box.schema.create_space('test_space')
+ts = box.schema.space.create('test_space')
 ti = ts:create_index('primary', { type = 'hash' })
 
 type(ts.on_replace)
diff --git a/test/box/protocol.result b/test/box/protocol.result
index 0783bf6302..67945c5bbe 100644
--- a/test/box/protocol.result
+++ b/test/box/protocol.result
@@ -4,7 +4,7 @@ box.schema.user.grant('guest', 'read,write,execute', 'universe')
 --------------------------------------------------------------------------------
 -- Test case for #273: IPROTO_ITERATOR ignored in network protocol
 --------------------------------------------------------------------------------
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 ---
 ...
 index = space:create_index('primary', { type = 'tree'})
diff --git a/test/box/protocol.test.lua b/test/box/protocol.test.lua
index 307909c843..f1c43455e5 100644
--- a/test/box/protocol.test.lua
+++ b/test/box/protocol.test.lua
@@ -4,7 +4,7 @@ box.schema.user.grant('guest', 'read,write,execute', 'universe')
 -- Test case for #273: IPROTO_ITERATOR ignored in network protocol
 --------------------------------------------------------------------------------
 
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 index = space:create_index('primary', { type = 'tree'})
 for i=1,5 do space:insert{i} end
 
diff --git a/test/box/reconfigure.result b/test/box/reconfigure.result
index 048460b37e..fbed002b40 100644
--- a/test/box/reconfigure.result
+++ b/test/box/reconfigure.result
@@ -33,7 +33,7 @@ box.cfg.io_collect_interval
 -- Valgrind reports use of not initialized memory after 'reload
 -- configuration'
 --
-space = box.schema.create_space('tweedledum', { id = 0 })
+space = box.schema.space.create('tweedledum', { id = 0 })
 ---
 ...
 index = space:create_index('primary', { type = 'hash'})
diff --git a/test/box/reconfigure.test.lua b/test/box/reconfigure.test.lua
index 9c607b9509..da3968288a 100644
--- a/test/box/reconfigure.test.lua
+++ b/test/box/reconfigure.test.lua
@@ -13,7 +13,7 @@ box.cfg.io_collect_interval
 -- Valgrind reports use of not initialized memory after 'reload
 -- configuration'
 --
-space = box.schema.create_space('tweedledum', { id = 0 })
+space = box.schema.space.create('tweedledum', { id = 0 })
 index = space:create_index('primary', { type = 'hash'})
 space:insert{1, 'tuple'}
 box.snapshot()
diff --git a/test/box/rtree_array.result b/test/box/rtree_array.result
index f3fcee570b..659b7905c4 100644
--- a/test/box/rtree_array.result
+++ b/test/box/rtree_array.result
@@ -1,4 +1,4 @@
-s = box.schema.create_space('spatial')
+s = box.schema.space.create('spatial')
 ---
 ...
 _ = s:create_index('primary')
diff --git a/test/box/rtree_array.test.lua b/test/box/rtree_array.test.lua
index 4ad495849b..19897b1d3a 100644
--- a/test/box/rtree_array.test.lua
+++ b/test/box/rtree_array.test.lua
@@ -1,4 +1,4 @@
-s = box.schema.create_space('spatial')
+s = box.schema.space.create('spatial')
 _ = s:create_index('primary')
 spatial = s:create_index('spatial', { type = 'rtree', unique = false, parts = {2, 'array'}})
 
diff --git a/test/box/rtree_errinj.test.lua b/test/box/rtree_errinj.test.lua
index 05844364ed..3a87cd3eab 100644
--- a/test/box/rtree_errinj.test.lua
+++ b/test/box/rtree_errinj.test.lua
@@ -1,6 +1,6 @@
 errinj = require('box.error.injection')
 
-s = box.schema.create_space('spatial')
+s = box.schema.space.create('spatial')
 
 s:create_index('primary')
 s:create_index('spatial', { type = 'rtree', unique = false, parts = {2, 'array'}})
diff --git a/test/box/rtree_misc.result b/test/box/rtree_misc.result
index ca6900581c..1cf45eed8e 100644
--- a/test/box/rtree_misc.result
+++ b/test/box/rtree_misc.result
@@ -1,4 +1,4 @@
-s = box.schema.create_space('spatial')
+s = box.schema.space.create('spatial')
 ---
 ...
 -- rtree index as primary key must be forbidden (unique)
@@ -205,7 +205,7 @@ s.index.spatial:select({})
 s:drop()
 ---
 ...
-s = box.schema.create_space('sophia', {engine = 'sophia'})
+s = box.schema.space.create('sophia', {engine = 'sophia'})
 ---
 ...
 -- rtree indexes are not enabled in sophia
@@ -225,7 +225,7 @@ s:drop()
 ---
 ...
 -- rtree in temp space must work fine
-s = box.schema.create_space('spatial', {temporary = true})
+s = box.schema.space.create('spatial', {temporary = true})
 ---
 ...
 i = s:create_index('primary', { type = 'tree', parts = {1, 'num'}})
@@ -246,7 +246,7 @@ s:drop()
 ---
 ...
 -- snapshot test
-s = box.schema.create_space('spatial')
+s = box.schema.space.create('spatial')
 ---
 ...
 i = s:create_index('primary', { type = 'tree', parts = {1, 'num'}})
diff --git a/test/box/rtree_misc.test.lua b/test/box/rtree_misc.test.lua
index df9efde3fc..fdc21ce307 100644
--- a/test/box/rtree_misc.test.lua
+++ b/test/box/rtree_misc.test.lua
@@ -1,4 +1,4 @@
-s = box.schema.create_space('spatial')
+s = box.schema.space.create('spatial')
 
 -- rtree index as primary key must be forbidden (unique)
 i = s:create_index('spatial', { type = 'rtree', unique = true, parts = {1, 'array'}})
@@ -81,7 +81,7 @@ s.index.spatial:select({})
 
 s:drop()
 
-s = box.schema.create_space('sophia', {engine = 'sophia'})
+s = box.schema.space.create('sophia', {engine = 'sophia'})
 -- rtree indexes are not enabled in sophia
 i = s:create_index('spatial', { type = 'rtree', unique = true, parts = {3, 'array'}})
 i = s:create_index('primary', { type = 'tree', parts = {1, 'num'}})
@@ -90,7 +90,7 @@ i = s:create_index('spatial', { type = 'rtree', unique = true, parts = {3, 'arra
 s:drop()
 
 -- rtree in temp space must work fine
-s = box.schema.create_space('spatial', {temporary = true})
+s = box.schema.space.create('spatial', {temporary = true})
 i = s:create_index('primary', { type = 'tree', parts = {1, 'num'}})
 i = s:create_index('spatial', { type = 'rtree', unique = false, parts = {3, 'array'}})
 s:insert{1, 2, {3, 4, 5, 6}}
@@ -98,7 +98,7 @@ s.index.spatial:select({0, 0, 10, 10}, {iterator = 'le'})
 s:drop()
 
 -- snapshot test
-s = box.schema.create_space('spatial')
+s = box.schema.space.create('spatial')
 i = s:create_index('primary', { type = 'tree', parts = {1, 'num'}})
 i = s:create_index('spatial', { type = 'rtree', unique = false, parts = {3, 'array'}})
 for i = 1,10 do s:insert{i, i, {i, i, i + 1, i + 1}} end
diff --git a/test/box/rtree_point.result b/test/box/rtree_point.result
index a138f14ed5..69c8214de1 100644
--- a/test/box/rtree_point.result
+++ b/test/box/rtree_point.result
@@ -1,4 +1,4 @@
-s = box.schema.create_space('spatial')
+s = box.schema.space.create('spatial')
 ---
 ...
 _ = s:create_index('primary')
diff --git a/test/box/rtree_point.test.lua b/test/box/rtree_point.test.lua
index 7c2f2757f4..d27ca6af5a 100644
--- a/test/box/rtree_point.test.lua
+++ b/test/box/rtree_point.test.lua
@@ -1,4 +1,4 @@
-s = box.schema.create_space('spatial')
+s = box.schema.space.create('spatial')
 _ = s:create_index('primary')
 _ = s:create_index('spatial', { type = 'rtree', unique = false, parts = {2, 'array'}})
 
diff --git a/test/box/rtree_point_r2.result b/test/box/rtree_point_r2.result
index 87f59e9c92..238d0d9cd0 100644
--- a/test/box/rtree_point_r2.result
+++ b/test/box/rtree_point_r2.result
@@ -1,4 +1,4 @@
-s = box.schema.create_space('spatial')
+s = box.schema.space.create('spatial')
 ---
 ...
 _ = s:create_index('primary')
diff --git a/test/box/rtree_point_r2.test.lua b/test/box/rtree_point_r2.test.lua
index 0a31020231..c6ec254b25 100644
--- a/test/box/rtree_point_r2.test.lua
+++ b/test/box/rtree_point_r2.test.lua
@@ -1,4 +1,4 @@
-s = box.schema.create_space('spatial')
+s = box.schema.space.create('spatial')
 _ = s:create_index('primary')
 _ = s:create_index('spatial', { type = 'rtree', unique = false, parts = {2, 'array'}})
 
diff --git a/test/box/rtree_rect.result b/test/box/rtree_rect.result
index 47b8810d3c..57daf4cddd 100644
--- a/test/box/rtree_rect.result
+++ b/test/box/rtree_rect.result
@@ -1,4 +1,4 @@
-s = box.schema.create_space('spatial')
+s = box.schema.space.create('spatial')
 ---
 ...
 _ = s:create_index('primary')
diff --git a/test/box/rtree_rect.test.lua b/test/box/rtree_rect.test.lua
index 96343a512b..b8b038d17e 100644
--- a/test/box/rtree_rect.test.lua
+++ b/test/box/rtree_rect.test.lua
@@ -1,4 +1,4 @@
-s = box.schema.create_space('spatial')
+s = box.schema.space.create('spatial')
 _ = s:create_index('primary')
 _ = s:create_index('spatial', { type = 'rtree', unique = false, parts = {2, 'array'}})
 
diff --git a/test/box/schema.result b/test/box/schema.result
index 02aa15cd96..42bb5f4125 100644
--- a/test/box/schema.result
+++ b/test/box/schema.result
@@ -1,10 +1,10 @@
-space = box.schema.create_space('tweedledum', { id = 0 })
+space = box.schema.space.create('tweedledum', { id = 0 })
 ---
 ...
-index = space:create_index('primary', { type = 'hash' })
+index = space:create_index('primary')
 ---
 ...
-t = {} for k,v in pairs(box.space[0]) do if type(v) ~= 'table' and type(v) ~= 'function' then table.insert(t, k..': '..tostring(v)) end end
+t = {} for k,v in pairs(box.space.tweedledum) do if type(v) ~= 'table' and type(v) ~= 'function' then table.insert(t, k..': '..tostring(v)) end end
 ---
 ...
 t
diff --git a/test/box/schema.test.lua b/test/box/schema.test.lua
index 0c72916a1d..ffb4e1ddfe 100644
--- a/test/box/schema.test.lua
+++ b/test/box/schema.test.lua
@@ -1,7 +1,7 @@
-space = box.schema.create_space('tweedledum', { id = 0 })
-index = space:create_index('primary', { type = 'hash' })
+space = box.schema.space.create('tweedledum', { id = 0 })
+index = space:create_index('primary')
 
-t = {} for k,v in pairs(box.space[0]) do if type(v) ~= 'table' and type(v) ~= 'function' then table.insert(t, k..': '..tostring(v)) end end
+t = {} for k,v in pairs(box.space.tweedledum) do if type(v) ~= 'table' and type(v) ~= 'function' then table.insert(t, k..': '..tostring(v)) end end
 t
 
 space:drop()
diff --git a/test/box/select.result b/test/box/select.result
index eabee2a4a3..cc4522a46f 100644
--- a/test/box/select.result
+++ b/test/box/select.result
@@ -1,4 +1,4 @@
-s = box.schema.create_space('select', { temporary = true })
+s = box.schema.space.create('select', { temporary = true })
 ---
 ...
 index1 = s:create_index('primary', { type = 'tree' })
@@ -538,7 +538,7 @@ s:select(2)
 s:drop()
 ---
 ...
-s = box.schema.create_space('select', { temporary = true })
+s = box.schema.space.create('select', { temporary = true })
 ---
 ...
 index = s:create_index('primary', { type = 'tree' })
diff --git a/test/box/select.test.lua b/test/box/select.test.lua
index cb30b6c4cc..2ac00390ff 100644
--- a/test/box/select.test.lua
+++ b/test/box/select.test.lua
@@ -1,4 +1,4 @@
-s = box.schema.create_space('select', { temporary = true })
+s = box.schema.space.create('select', { temporary = true })
 index1 = s:create_index('primary', { type = 'tree' })
 index2 = s:create_index('second', { type = 'tree', unique = true,  parts = {2, 'num', 1, 'num'}})
 for i = 1, 20 do s:insert({ i, 1, 2, 3 }) end
@@ -77,7 +77,7 @@ s:select(2)
 
 s:drop()
 
-s = box.schema.create_space('select', { temporary = true })
+s = box.schema.space.create('select', { temporary = true })
 index = s:create_index('primary', { type = 'tree' })
 local a s:insert{0}
 lots_of_links = {}
diff --git a/test/box/session.result b/test/box/session.result
index eb905aca72..1d254e10f7 100644
--- a/test/box/session.result
+++ b/test/box/session.result
@@ -4,7 +4,7 @@ session = box.session
 fiber = require('fiber')
 ---
 ...
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 ---
 ...
 index = space:create_index('primary', { type = 'hash' })
diff --git a/test/box/session.test.lua b/test/box/session.test.lua
index 367755ebd1..3474dbb34c 100644
--- a/test/box/session.test.lua
+++ b/test/box/session.test.lua
@@ -1,7 +1,7 @@
 session = box.session
 fiber = require('fiber')
 
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 index = space:create_index('primary', { type = 'hash' })
 
 session.exists(session.id())
diff --git a/test/box/snapshot.result b/test/box/snapshot.result
index b5920d4121..a7b25bb56b 100644
--- a/test/box/snapshot.result
+++ b/test/box/snapshot.result
@@ -1,4 +1,4 @@
-space = box.schema.create_space('tweedledum', { id = 0 })
+space = box.schema.space.create('tweedledum', { id = 0 })
 ---
 ...
 index = space:create_index('primary', { type = 'hash' })
diff --git a/test/box/snapshot.test.py b/test/box/snapshot.test.py
index cdcbbdfe3c..c4ea714b3f 100644
--- a/test/box/snapshot.test.py
+++ b/test/box/snapshot.test.py
@@ -3,7 +3,7 @@ import yaml
 import time
 from signal import SIGUSR1
 
-admin("space = box.schema.create_space('tweedledum', { id = 0 })")
+admin("space = box.schema.space.create('tweedledum', { id = 0 })")
 admin("index = space:create_index('primary', { type = 'hash' })")
 
 print """#
diff --git a/test/box/snapshot_daemon.result b/test/box/snapshot_daemon.result
index 9ec92a93e0..11bc61955b 100644
--- a/test/box/snapshot_daemon.result
+++ b/test/box/snapshot_daemon.result
@@ -43,7 +43,7 @@ end
 
 ---
 ...
-space = box.schema.create_space('snapshot_daemon')
+space = box.schema.space.create('snapshot_daemon')
 ---
 ...
 index = space:create_index('pk', { type = 'tree', parts = { 1, 'num' }})
diff --git a/test/box/snapshot_daemon.test.lua b/test/box/snapshot_daemon.test.lua
index 73f0ef4dc4..29b0904dc0 100644
--- a/test/box/snapshot_daemon.test.lua
+++ b/test/box/snapshot_daemon.test.lua
@@ -23,7 +23,7 @@ end
 --# setopt delimiter ''
 
 
-space = box.schema.create_space('snapshot_daemon')
+space = box.schema.space.create('snapshot_daemon')
 index = space:create_index('pk', { type = 'tree', parts = { 1, 'num' }})
 
 
diff --git a/test/box/sql.result b/test/box/sql.result
index df4e0942d4..de8c1e7a36 100644
--- a/test/box/sql.result
+++ b/test/box/sql.result
@@ -1,4 +1,4 @@
-function f() box.schema.create_space('test', { id = 0 }) end
+function f() box.schema.space.create('test', { id = 0 }) end
 ---
 ...
 box.schema.user.create('test', { password = 'test' })
diff --git a/test/box/sql.test.py b/test/box/sql.test.py
index 62ddcab93f..978d192afd 100644
--- a/test/box/sql.test.py
+++ b/test/box/sql.test.py
@@ -1,6 +1,6 @@
 import tarantool
 
-admin("function f() box.schema.create_space('test', { id = 0 }) end")
+admin("function f() box.schema.space.create('test', { id = 0 }) end")
 admin("box.schema.user.create('test', { password = 'test' })")
 admin("box.schema.func.create('f')")
 admin("box.schema.user.grant('test', 'Write', 'space', '_space')")
diff --git a/test/box/stat.result b/test/box/stat.result
index c3d0ef87bc..f497bce295 100644
--- a/test/box/stat.result
+++ b/test/box/stat.result
@@ -21,7 +21,7 @@ box.stat.SELECT.total
 ---
 - 0
 ...
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 ---
 ...
 index = space:create_index('primary', { type = 'hash' })
diff --git a/test/box/stat.test.lua b/test/box/stat.test.lua
index d25a67e22f..5ff384a4d1 100644
--- a/test/box/stat.test.lua
+++ b/test/box/stat.test.lua
@@ -7,7 +7,7 @@ box.stat.UPDATE.total
 box.stat.REPLACE.total
 box.stat.SELECT.total
 
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 index = space:create_index('primary', { type = 'hash' })
 
 -- check stat_cleanup
diff --git a/test/box/temp_spaces.result b/test/box/temp_spaces.result
index f2701e632d..4b6512cfe8 100644
--- a/test/box/temp_spaces.result
+++ b/test/box/temp_spaces.result
@@ -6,7 +6,7 @@ _space = box.space._space
 FLAGS = 6
 ---
 ...
-s = box.schema.create_space('t', { temporary = true })
+s = box.schema.space.create('t', { temporary = true })
 ---
 ...
 s.temporary
@@ -17,7 +17,7 @@ s:drop()
 ---
 ...
 -- not a temporary, too
-s = box.schema.create_space('t', { temporary = false })
+s = box.schema.space.create('t', { temporary = false })
 ---
 ...
 s.temporary
@@ -28,7 +28,7 @@ s:drop()
 ---
 ...
 -- not a temporary, too
-s = box.schema.create_space('t', { temporary = nil })
+s = box.schema.space.create('t', { temporary = nil })
 ---
 ...
 s.temporary
@@ -38,7 +38,7 @@ s.temporary
 s:drop()
 ---
 ...
-s = box.schema.create_space('t', { temporary = true })
+s = box.schema.space.create('t', { temporary = true })
 ---
 ...
 index = s:create_index('primary', { type = 'hash' })
diff --git a/test/box/temp_spaces.test.lua b/test/box/temp_spaces.test.lua
index 17a8a5383d..be6d9ded94 100644
--- a/test/box/temp_spaces.test.lua
+++ b/test/box/temp_spaces.test.lua
@@ -2,21 +2,21 @@
 _space = box.space._space
 -- not a temporary
 FLAGS = 6
-s = box.schema.create_space('t', { temporary = true })
+s = box.schema.space.create('t', { temporary = true })
 s.temporary
 s:drop()
 
 -- not a temporary, too
-s = box.schema.create_space('t', { temporary = false })
+s = box.schema.space.create('t', { temporary = false })
 s.temporary
 s:drop()
 
 -- not a temporary, too
-s = box.schema.create_space('t', { temporary = nil })
+s = box.schema.space.create('t', { temporary = nil })
 s.temporary
 s:drop()
 
-s = box.schema.create_space('t', { temporary = true })
+s = box.schema.space.create('t', { temporary = true })
 index = s:create_index('primary', { type = 'hash' })
 
 s:insert{1, 2, 3}
diff --git a/test/box/transaction.result b/test/box/transaction.result
index 0b5ae919a4..9ac1036278 100644
--- a/test/box/transaction.result
+++ b/test/box/transaction.result
@@ -261,7 +261,7 @@ s:drop();
 ---
 ...
 --# setopt delimiter ''
-tester = box.schema.create_space('tester')
+tester = box.schema.space.create('tester')
 ---
 ...
 tindex = tester:create_index('primary')
diff --git a/test/box/transaction.test.lua b/test/box/transaction.test.lua
index c49152234d..4c9fc8f5f3 100644
--- a/test/box/transaction.test.lua
+++ b/test/box/transaction.test.lua
@@ -121,7 +121,7 @@ t;
 s:select{};
 s:drop();
 --# setopt delimiter ''
-tester = box.schema.create_space('tester')
+tester = box.schema.space.create('tester')
 tindex = tester:create_index('primary')
 box.begin() tester:insert{1} box.rollback()
 tester:select{1}
diff --git a/test/box/tuple.result b/test/box/tuple.result
index 1023399bbe..8a4f7a0beb 100644
--- a/test/box/tuple.result
+++ b/test/box/tuple.result
@@ -325,7 +325,7 @@ getmetatable(box.tuple.new{1, 2, 3}:totable())
 - __serialize: seq
 ...
 --  A test case for the key as an tuple
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 ---
 ...
 index = space:create_index('primary')
diff --git a/test/box/tuple.test.lua b/test/box/tuple.test.lua
index 487cc23ed1..5c84de193b 100644
--- a/test/box/tuple.test.lua
+++ b/test/box/tuple.test.lua
@@ -94,7 +94,7 @@ box.tuple.new{1, 2, 3}:totable()
 getmetatable(box.tuple.new{1, 2, 3}:totable())
 
 --  A test case for the key as an tuple
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 index = space:create_index('primary')
 space:truncate()
 t=space:insert{0, 777, '0', '1', '2', '3'}
diff --git a/test/box/update.result b/test/box/update.result
index 4b398140e5..2094e4a2ab 100644
--- a/test/box/update.result
+++ b/test/box/update.result
@@ -1,4 +1,4 @@
-s = box.schema.create_space('tweedledum')
+s = box.schema.space.create('tweedledum')
 ---
 ...
 index = s:create_index('pk')
@@ -315,7 +315,7 @@ s:drop()
 ---
 ...
 -- #521: Cryptic error message in update operation
-s = box.schema.create_space('tweedledum')
+s = box.schema.space.create('tweedledum')
 ---
 ...
 index = s:create_index('pk')
diff --git a/test/box/update.test.lua b/test/box/update.test.lua
index e798f25b4d..f662569f30 100644
--- a/test/box/update.test.lua
+++ b/test/box/update.test.lua
@@ -1,4 +1,4 @@
-s = box.schema.create_space('tweedledum')
+s = box.schema.space.create('tweedledum')
 index = s:create_index('pk')
 
 -- test delete field
@@ -108,7 +108,7 @@ s:truncate()
 s:drop()
 
 -- #521: Cryptic error message in update operation
-s = box.schema.create_space('tweedledum')
+s = box.schema.space.create('tweedledum')
 index = s:create_index('pk')
 s:insert{1, 2, 3}
 s:update({1})
diff --git a/test/replication/consistent.result b/test/replication/consistent.result
index a57f992fb1..6ead21d87a 100644
--- a/test/replication/consistent.result
+++ b/test/replication/consistent.result
@@ -57,7 +57,7 @@ a:close()
 ---
 - true
 ...
-s = box.schema.create_space('tweedledum', {id = 0});
+s = box.schema.space.create('tweedledum', {id = 0});
 ---
 ...
 index = s:create_index('primary', {type = 'hash'})
diff --git a/test/replication/consistent.test.lua b/test/replication/consistent.test.lua
index a921afba79..a1d6313cc3 100644
--- a/test/replication/consistent.test.lua
+++ b/test/replication/consistent.test.lua
@@ -43,7 +43,7 @@ a = box.net.box.new('127.0.0.1', replica_port)
 a:call('_set_pri_lsn', box.info.lsn)
 a:close()
 
-s = box.schema.create_space('tweedledum', {id = 0});
+s = box.schema.space.create('tweedledum', {id = 0});
 index = s:create_index('primary', {type = 'hash'})
 _insert(1, 10, 'master')
 _select(1, 10)
diff --git a/test/replication/hot_standby.result b/test/replication/hot_standby.result
index 537c7977ec..69ba5bc477 100644
--- a/test/replication/hot_standby.result
+++ b/test/replication/hot_standby.result
@@ -74,7 +74,7 @@ box.info.status
 ---
 - running
 ...
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 ---
 ...
 index = space:create_index('primary', { type = 'hash' })
diff --git a/test/replication/hot_standby.test.lua b/test/replication/hot_standby.test.lua
index 809a9639b7..e5865acc8e 100644
--- a/test/replication/hot_standby.test.lua
+++ b/test/replication/hot_standby.test.lua
@@ -60,7 +60,7 @@ box.info.status
 --# set connection default
 box.info.status
 
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 index = space:create_index('primary', { type = 'hash' })
 
 -- set begin lsn on master, replica and hot_standby.
diff --git a/test/replication/init_storage.result b/test/replication/init_storage.result
index f2d992e897..852144da15 100644
--- a/test/replication/init_storage.result
+++ b/test/replication/init_storage.result
@@ -1,7 +1,7 @@
 box.schema.user.grant('guest', 'replication')
 ---
 ...
-space = box.schema.create_space('test', {id =  42})
+space = box.schema.space.create('test', {id =  42})
 ---
 ...
 index = space:create_index('primary', { type = 'tree'})
diff --git a/test/replication/init_storage.test.py b/test/replication/init_storage.test.py
index d17f7cbf3f..ad9c4f68e1 100644
--- a/test/replication/init_storage.test.py
+++ b/test/replication/init_storage.test.py
@@ -7,7 +7,7 @@ master = server
 master_id = master.get_param('server')['id']
 
 master.admin("box.schema.user.grant('guest', 'replication')")
-master.admin("space = box.schema.create_space('test', {id =  42})")
+master.admin("space = box.schema.space.create('test', {id =  42})")
 master.admin("index = space:create_index('primary', { type = 'tree'})")
 
 master.admin('for k = 1, 9 do space:insert{k, k*k} end')
diff --git a/test/replication/readonly.result b/test/replication/readonly.result
index f6d59d4e12..dd38c37d9d 100644
--- a/test/replication/readonly.result
+++ b/test/replication/readonly.result
@@ -31,7 +31,7 @@ box.info.server.lsn
 ---
 - -1
 ...
-space = box.schema.create_space("ro")
+space = box.schema.space.create("ro")
 ---
 - error: Can't modify data because this server in read-only mode.
 ...
diff --git a/test/replication/readonly.test.py b/test/replication/readonly.test.py
index deb323536d..9f54fe67c0 100644
--- a/test/replication/readonly.test.py
+++ b/test/replication/readonly.test.py
@@ -38,7 +38,7 @@ replica.admin('box.cfg{replication_source = ""}')
 replica.admin('box.info.server.id')
 replica.admin('box.info.server.ro')
 replica.admin('box.info.server.lsn')
-replica.admin('space = box.schema.create_space("ro")')
+replica.admin('space = box.schema.space.create("ro")')
 replica.admin('box.info.vclock[%d]' % replica_id)
 
 replica.stop()
diff --git a/test/replication/swap.result b/test/replication/swap.result
index 117f464cec..d2ba41ab47 100644
--- a/test/replication/swap.result
+++ b/test/replication/swap.result
@@ -10,7 +10,7 @@ while box.info.server.id == 0 do require('fiber').sleep(0.01) end
 while box.space['_priv']:len() < 1 do require('fiber').sleep(0.01) end
 ---
 ...
-s = box.schema.create_space('tweedledum', {id = 0})
+s = box.schema.space.create('tweedledum', {id = 0})
 ---
 ...
 index = s:create_index('primary', {type = 'hash'})
diff --git a/test/replication/swap.test.py b/test/replication/swap.test.py
index 108d7f237b..fafd6c06bf 100644
--- a/test/replication/swap.test.py
+++ b/test/replication/swap.test.py
@@ -36,7 +36,7 @@ replica.uri = '%s:%s@%s' % (LOGIN, PASSWORD, replica.sql.uri)
 replica.admin("while box.space['_priv']:len() < 1 do require('fiber').sleep(0.01) end")
 replica.sql.py_con.authenticate(LOGIN, PASSWORD)
 
-master.admin("s = box.schema.create_space('tweedledum', {id = 0})")
+master.admin("s = box.schema.space.create('tweedledum', {id = 0})")
 master.admin("index = s:create_index('primary', {type = 'hash'})")
 
 ### gh-343: replica.cc must not add login and password to proc title
diff --git a/test/sophia/crud.result b/test/sophia/crud.result
index 4b03e00703..550a79d189 100644
--- a/test/sophia/crud.result
+++ b/test/sophia/crud.result
@@ -1,5 +1,5 @@
 -- insert
-space = box.schema.create_space('test', { engine = 'sophia' })
+space = box.schema.space.create('test', { engine = 'sophia' })
 ---
 ...
 index = space:create_index('primary', { type = 'tree', parts = {1, 'num'} })
diff --git a/test/sophia/crud.test.lua b/test/sophia/crud.test.lua
index 70df6ba13d..9b48c4339f 100644
--- a/test/sophia/crud.test.lua
+++ b/test/sophia/crud.test.lua
@@ -1,7 +1,7 @@
 
 -- insert
 
-space = box.schema.create_space('test', { engine = 'sophia' })
+space = box.schema.space.create('test', { engine = 'sophia' })
 index = space:create_index('primary', { type = 'tree', parts = {1, 'num'} })
 sophia_dir()[1]
 for key = 1, 132 do space:insert({key}) end
diff --git a/test/sophia/dml.result b/test/sophia/dml.result
index 946b6e6b8b..345a84d22b 100644
--- a/test/sophia/dml.result
+++ b/test/sophia/dml.result
@@ -1,5 +1,5 @@
 -- space create/drop
-space = box.schema.create_space('test', { engine = 'sophia' })
+space = box.schema.space.create('test', { engine = 'sophia' })
 ---
 ...
 sophia_dir()[1]
@@ -18,7 +18,7 @@ sophia_dir()[1]
 - 0
 ...
 -- index create/drop
-space = box.schema.create_space('test', { engine = 'sophia' })
+space = box.schema.space.create('test', { engine = 'sophia' })
 ---
 ...
 index = space:create_index('primary')
@@ -40,7 +40,7 @@ sophia_dir()[1]
 - 0
 ...
 -- index create/drop alter
-space = box.schema.create_space('test', { engine = 'sophia' })
+space = box.schema.space.create('test', { engine = 'sophia' })
 ---
 ...
 index = space:create_index('primary')
@@ -68,7 +68,7 @@ sophia_dir()[1]
 - 0
 ...
 -- index create/drop tree string
-space = box.schema.create_space('test', { engine = 'sophia' })
+space = box.schema.space.create('test', { engine = 'sophia' })
 ---
 ...
 index = space:create_index('primary', {type = 'tree', parts = {1, 'STR'}})
@@ -90,7 +90,7 @@ sophia_dir()[1]
 - 0
 ...
 -- index create/drop tree num
-space = box.schema.create_space('test', { engine = 'sophia' })
+space = box.schema.space.create('test', { engine = 'sophia' })
 ---
 ...
 index = space:create_index('primary', {type = 'tree', parts = {1, 'num'}})
@@ -112,7 +112,7 @@ sophia_dir()[1]
 - 0
 ...
 -- index create hash 
-space = box.schema.create_space('test', { engine = 'sophia' })
+space = box.schema.space.create('test', { engine = 'sophia' })
 ---
 ...
 index = space:create_index('primary', {type = 'hash'})
@@ -131,7 +131,7 @@ sophia_dir()[1]
 - 0
 ...
 -- secondary index create
-space = box.schema.create_space('test', { engine = 'sophia' })
+space = box.schema.space.create('test', { engine = 'sophia' })
 ---
 ...
 index1 = space:create_index('primary')
@@ -154,7 +154,7 @@ sophia_dir()[1]
 - 0
 ...
 -- index size
-space = box.schema.create_space('test', { engine = 'sophia' })
+space = box.schema.space.create('test', { engine = 'sophia' })
 ---
 ...
 index = space:create_index('primary')
diff --git a/test/sophia/dml.test.lua b/test/sophia/dml.test.lua
index 871ea897ab..f6a699f9d7 100644
--- a/test/sophia/dml.test.lua
+++ b/test/sophia/dml.test.lua
@@ -1,7 +1,7 @@
 
 -- space create/drop
 
-space = box.schema.create_space('test', { engine = 'sophia' })
+space = box.schema.space.create('test', { engine = 'sophia' })
 sophia_dir()[1]
 space:drop()
 sophia_schedule()
@@ -9,7 +9,7 @@ sophia_dir()[1]
 
 -- index create/drop
 
-space = box.schema.create_space('test', { engine = 'sophia' })
+space = box.schema.space.create('test', { engine = 'sophia' })
 index = space:create_index('primary')
 sophia_dir()[1]
 space:drop()
@@ -18,7 +18,7 @@ sophia_dir()[1]
 
 -- index create/drop alter
 
-space = box.schema.create_space('test', { engine = 'sophia' })
+space = box.schema.space.create('test', { engine = 'sophia' })
 index = space:create_index('primary')
 sophia_dir()[1]
 _index = box.space[box.schema.INDEX_ID]
@@ -29,7 +29,7 @@ sophia_dir()[1]
 
 -- index create/drop tree string
 
-space = box.schema.create_space('test', { engine = 'sophia' })
+space = box.schema.space.create('test', { engine = 'sophia' })
 index = space:create_index('primary', {type = 'tree', parts = {1, 'STR'}})
 space:insert({'test'})
 space:drop()
@@ -38,7 +38,7 @@ sophia_dir()[1]
 
 -- index create/drop tree num
 
-space = box.schema.create_space('test', { engine = 'sophia' })
+space = box.schema.space.create('test', { engine = 'sophia' })
 index = space:create_index('primary', {type = 'tree', parts = {1, 'num'}})
 space:insert({13})
 space:drop()
@@ -47,7 +47,7 @@ sophia_dir()[1]
 
 -- index create hash 
 
-space = box.schema.create_space('test', { engine = 'sophia' })
+space = box.schema.space.create('test', { engine = 'sophia' })
 index = space:create_index('primary', {type = 'hash'})
 space:drop()
 sophia_schedule()
@@ -55,7 +55,7 @@ sophia_dir()[1]
 
 -- secondary index create
 
-space = box.schema.create_space('test', { engine = 'sophia' })
+space = box.schema.space.create('test', { engine = 'sophia' })
 index1 = space:create_index('primary')
 index2 = space:create_index('secondary')
 space:drop()
@@ -64,7 +64,7 @@ sophia_dir()[1]
 
 -- index size
 
-space = box.schema.create_space('test', { engine = 'sophia' })
+space = box.schema.space.create('test', { engine = 'sophia' })
 index = space:create_index('primary')
 primary = space.index[0]
 primary:len()
diff --git a/test/sophia/gh.result b/test/sophia/gh.result
index 3444c17358..c1933e0429 100644
--- a/test/sophia/gh.result
+++ b/test/sophia/gh.result
@@ -1,5 +1,5 @@
 -- gh-283: Sophia: hang after three creates and drops
-s = box.schema.create_space('space0', {engine='sophia'})
+s = box.schema.space.create('space0', {engine='sophia'})
 ---
 ...
 i = s:create_index('space0', {type = 'tree', parts = {1, 'STR'}})
@@ -16,7 +16,7 @@ sophia_schedule()
 ---
 - 1
 ...
-s = box.schema.create_space('space0', {engine='sophia'})
+s = box.schema.space.create('space0', {engine='sophia'})
 ---
 ...
 i = s:create_index('space0', {type = 'tree', parts = {1, 'STR'}})
@@ -40,7 +40,7 @@ sophia_schedule()
 ---
 - 1
 ...
-s = box.schema.create_space('space0', {engine='sophia'})
+s = box.schema.space.create('space0', {engine='sophia'})
 ---
 ...
 i = s:create_index('space0', {type = 'tree', parts = {1, 'STR'}})
@@ -65,7 +65,7 @@ sophia_schedule()
 - 1
 ...
 -- gh-280: Sophia: crash if insert without index
-s = box.schema.create_space('test', {engine='sophia'})
+s = box.schema.space.create('test', {engine='sophia'})
 ---
 ...
 s:insert{'a'}
@@ -80,12 +80,12 @@ sophia_schedule()
 - 0
 ...
 -- gh-436: No error when creating temporary sophia space
-s = box.schema.create_space('tester',{engine='sophia', temporary=true})
+s = box.schema.space.create('tester',{engine='sophia', temporary=true})
 ---
 - error: 'Can''t modify space ''tester'': space does not support temporary flag'
 ...
 -- gh-432: Sophia: ignored limit
-s = box.schema.create_space('tester',{engine='sophia'})
+s = box.schema.space.create('tester',{engine='sophia'})
 ---
 ...
 i = s:create_index('sophia_index', {})
@@ -116,7 +116,7 @@ sophia_schedule()
 ---
 - 1
 ...
-s = box.schema.create_space('tester', {engine='sophia'})
+s = box.schema.space.create('tester', {engine='sophia'})
 ---
 ...
 i = s:create_index('sophia_index', {type = 'tree', parts = {1, 'STR'}})
diff --git a/test/sophia/gh.test.lua b/test/sophia/gh.test.lua
index d0c91a0811..40698f195b 100644
--- a/test/sophia/gh.test.lua
+++ b/test/sophia/gh.test.lua
@@ -1,13 +1,13 @@
 
 -- gh-283: Sophia: hang after three creates and drops
 
-s = box.schema.create_space('space0', {engine='sophia'})
+s = box.schema.space.create('space0', {engine='sophia'})
 i = s:create_index('space0', {type = 'tree', parts = {1, 'STR'}})
 s:insert{'a', 'b', 'c'}
 s:drop()
 sophia_schedule()
 
-s = box.schema.create_space('space0', {engine='sophia'})
+s = box.schema.space.create('space0', {engine='sophia'})
 i = s:create_index('space0', {type = 'tree', parts = {1, 'STR'}})
 s:insert{'a', 'b', 'c'}
 t = s.index[0]:select({}, {iterator = box.index.ALL})
@@ -15,7 +15,7 @@ t
 s:drop()
 sophia_schedule()
 
-s = box.schema.create_space('space0', {engine='sophia'})
+s = box.schema.space.create('space0', {engine='sophia'})
 i = s:create_index('space0', {type = 'tree', parts = {1, 'STR'}})
 s:insert{'a', 'b', 'c'}
 t = s.index[0]:select({}, {iterator = box.index.ALL})
@@ -25,18 +25,18 @@ sophia_schedule()
 
 -- gh-280: Sophia: crash if insert without index
 
-s = box.schema.create_space('test', {engine='sophia'})
+s = box.schema.space.create('test', {engine='sophia'})
 s:insert{'a'}
 s:drop()
 sophia_schedule()
 
 -- gh-436: No error when creating temporary sophia space
 
-s = box.schema.create_space('tester',{engine='sophia', temporary=true})
+s = box.schema.space.create('tester',{engine='sophia', temporary=true})
 
 -- gh-432: Sophia: ignored limit
 
-s = box.schema.create_space('tester',{engine='sophia'})
+s = box.schema.space.create('tester',{engine='sophia'})
 i = s:create_index('sophia_index', {})
 for v=1, 100 do s:insert({v}) end
 t = s:select({''},{iterator='GT', limit =1})
@@ -46,7 +46,7 @@ t
 s:drop()
 sophia_schedule()
 
-s = box.schema.create_space('tester', {engine='sophia'})
+s = box.schema.space.create('tester', {engine='sophia'})
 i = s:create_index('sophia_index', {type = 'tree', parts = {1, 'STR'}})
 for v=1, 100 do s:insert({tostring(v)}) end
 t = s:select({''},{iterator='GT', limit =1})
diff --git a/test/sophia/info.result b/test/sophia/info.result
index 42efdc426b..2fe4e8e982 100644
--- a/test/sophia/info.result
+++ b/test/sophia/info.result
@@ -1,5 +1,5 @@
 -- box.info().sophia['sophia.version']
-space = box.schema.create_space('test', { engine = 'sophia' })
+space = box.schema.space.create('test', { engine = 'sophia' })
 ---
 ...
 index = space:create_index('primary', { type = 'tree', parts = {1, 'num'} })
diff --git a/test/sophia/info.test.lua b/test/sophia/info.test.lua
index df540e47b0..b715e1097a 100644
--- a/test/sophia/info.test.lua
+++ b/test/sophia/info.test.lua
@@ -1,6 +1,6 @@
 -- box.info().sophia['sophia.version']
 
-space = box.schema.create_space('test', { engine = 'sophia' })
+space = box.schema.space.create('test', { engine = 'sophia' })
 index = space:create_index('primary', { type = 'tree', parts = {1, 'num'} })
 
 for key = 1, 10 do space:insert({key}) end
diff --git a/test/sophia/random.result b/test/sophia/random.result
index e131458bf6..4d57fe8919 100644
--- a/test/sophia/random.result
+++ b/test/sophia/random.result
@@ -1,5 +1,5 @@
 -- random
-space = box.schema.create_space('test', { engine = 'sophia'})
+space = box.schema.space.create('test', { engine = 'sophia'})
 ---
 ...
 index = space:create_index('primary', { type = 'tree', parts = {1, 'num'} })
diff --git a/test/sophia/random.test.lua b/test/sophia/random.test.lua
index bfa9885a24..e302402534 100644
--- a/test/sophia/random.test.lua
+++ b/test/sophia/random.test.lua
@@ -1,7 +1,7 @@
 
 -- random
 
-space = box.schema.create_space('test', { engine = 'sophia'})
+space = box.schema.space.create('test', { engine = 'sophia'})
 index = space:create_index('primary', { type = 'tree', parts = {1, 'num'} })
 
 dofile('index_random_test.lua')
diff --git a/test/sophia/snapshot.result b/test/sophia/snapshot.result
index 6452499061..6b27014b72 100644
--- a/test/sophia/snapshot.result
+++ b/test/sophia/snapshot.result
@@ -1,5 +1,5 @@
 -- snapshot
-space = box.schema.create_space('test', { id = 100, engine = 'sophia' })
+space = box.schema.space.create('test', { id = 100, engine = 'sophia' })
 ---
 ...
 index = space:create_index('primary')
diff --git a/test/sophia/snapshot.test.lua b/test/sophia/snapshot.test.lua
index 22b974f9c4..a213e2fb16 100644
--- a/test/sophia/snapshot.test.lua
+++ b/test/sophia/snapshot.test.lua
@@ -6,7 +6,7 @@ os.execute("touch mt")
 --# stop server default
 --# start server default
 
-space = box.schema.create_space('test', { engine = 'sophia' })
+space = box.schema.space.create('test', { engine = 'sophia' })
 index = space:create_index('primary')
 
 for key = 1, 351 do space:insert({key}) end
diff --git a/test/sophia/transaction.result b/test/sophia/transaction.result
index 19b0389a76..b8153503e6 100644
--- a/test/sophia/transaction.result
+++ b/test/sophia/transaction.result
@@ -1,4 +1,4 @@
-space = box.schema.create_space('test', { engine = 'sophia' })
+space = box.schema.space.create('test', { engine = 'sophia' })
 ---
 ...
 index = space:create_index('primary', { type = 'tree', parts = {1, 'num'} })
diff --git a/test/sophia/transaction.test.lua b/test/sophia/transaction.test.lua
index cd3c73f051..09539c06bc 100644
--- a/test/sophia/transaction.test.lua
+++ b/test/sophia/transaction.test.lua
@@ -1,5 +1,5 @@
 
-space = box.schema.create_space('test', { engine = 'sophia' })
+space = box.schema.space.create('test', { engine = 'sophia' })
 index = space:create_index('primary', { type = 'tree', parts = {1, 'num'} })
 
 -- begin/rollback
diff --git a/test/sophia/transaction_multidb.result b/test/sophia/transaction_multidb.result
index 2b381c05bc..8131471ec1 100644
--- a/test/sophia/transaction_multidb.result
+++ b/test/sophia/transaction_multidb.result
@@ -1,10 +1,10 @@
-a = box.schema.create_space('test', { engine = 'sophia' })
+a = box.schema.space.create('test', { engine = 'sophia' })
 ---
 ...
 index = a:create_index('primary', { type = 'tree', parts = {1, 'num'} })
 ---
 ...
-b = box.schema.create_space('test_tmp', { engine = 'sophia' })
+b = box.schema.space.create('test_tmp', { engine = 'sophia' })
 ---
 ...
 index = b:create_index('primary', { type = 'tree', parts = {1, 'num'} })
diff --git a/test/sophia/transaction_multidb.test.lua b/test/sophia/transaction_multidb.test.lua
index 70410bf81b..b4af8d62d7 100644
--- a/test/sophia/transaction_multidb.test.lua
+++ b/test/sophia/transaction_multidb.test.lua
@@ -1,8 +1,8 @@
 
-a = box.schema.create_space('test', { engine = 'sophia' })
+a = box.schema.space.create('test', { engine = 'sophia' })
 index = a:create_index('primary', { type = 'tree', parts = {1, 'num'} })
 
-b = box.schema.create_space('test_tmp', { engine = 'sophia' })
+b = box.schema.space.create('test_tmp', { engine = 'sophia' })
 index = b:create_index('primary', { type = 'tree', parts = {1, 'num'} })
 
 -- begin/rollback
diff --git a/test/sophia/truncate.test.lua b/test/sophia/truncate.test.lua
index 85eed04e34..53eba30123 100644
--- a/test/sophia/truncate.test.lua
+++ b/test/sophia/truncate.test.lua
@@ -1,7 +1,7 @@
 
 -- truncate
 
-s = box.schema.create_space('name_of_space', {engine='sophia'})
+s = box.schema.space.create('name_of_space', {engine='sophia'})
 i = s:create_index('name_of_index', {type = 'tree', parts = {1, 'STR'}})
 s:insert{'a', 'b', 'c'}
 box.space['name_of_space']:select{'a'}
diff --git a/test/xlog/xlog.result b/test/xlog/xlog.result
index 721ebf55c2..0594df8747 100644
--- a/test/xlog/xlog.result
+++ b/test/xlog/xlog.result
@@ -1,7 +1,7 @@
 
 # Inprogress xlog must be renamed before second insert.
 
-space = box.schema.create_space('tweedledum', { id = 0 })
+space = box.schema.space.create('tweedledum', { id = 0 })
 ---
 ...
 .xlog.inprogress exists
@@ -31,40 +31,40 @@ box.space[0]:insert{5, 'Unfinished record'}
 ...
 .xlog exists
 .xlog.inprogress hash been successfully renamed
-space = box.schema.create_space('test')
+space = box.schema.space.create('test')
 ---
 ...
-index = box.space['test']:create_index('primary')
+index = box.space.test:create_index('primary')
 ---
 ...
-box.space['test']:insert{1, 'first tuple'}
+box.space.test:insert{1, 'first tuple'}
 ---
 - [1, 'first tuple']
 ...
-box.space['test']:insert{2, 'second tuple'}
+box.space.test:insert{2, 'second tuple'}
 ---
 - [2, 'second tuple']
 ...
 .xlog exists
-space = box.schema.create_space('test')
+space = box.schema.space.create('test')
 ---
 ...
-index = box.space['test']:create_index('primary')
+index = box.space.test:create_index('primary')
 ---
 ...
-box.space['test']:insert{1, 'first tuple'}
+box.space.test:insert{1, 'first tuple'}
 ---
 - [1, 'first tuple']
 ...
-box.space['test']:delete{1}
+box.space.test:delete{1}
 ---
 - [1, 'first tuple']
 ...
-box.space['test']:insert{1, 'third tuple'}
+box.space.test:insert{1, 'third tuple'}
 ---
 - [1, 'third tuple']
 ...
-box.space['test']:insert{2, 'fourth tuple'}
+box.space.test:insert{2, 'fourth tuple'}
 ---
 - [2, 'fourth tuple']
 ...
@@ -73,19 +73,19 @@ check log line for 'Duplicate key'
 
 'Duplicate key' exists in server log
 
-box.space['test']:get{1}
+box.space.test:get{1}
 ---
 - [1, 'first tuple']
 ...
-box.space['test']:get{2}
+box.space.test:get{2}
 ---
 - [2, 'second tuple']
 ...
-box.space['test']:len()
+box.space.test:len()
 ---
 - 2
 ...
-space = box.schema.create_space('test')
+space = box.schema.space.create('test')
 ---
 ...
 index = box.space.test:create_index('primary')
@@ -117,7 +117,7 @@ box.space.test:select{}
   - [2, 'second tuple']
   - [4, 'fourth tuple']
 ...
-space = box.schema.create_space('test')
+space = box.schema.space.create('test')
 ---
 ...
 index = box.space.test:create_index('primary')
diff --git a/test/xlog/xlog.test.py b/test/xlog/xlog.test.py
index 9b1564995f..c5782934e3 100644
--- a/test/xlog/xlog.test.py
+++ b/test/xlog/xlog.test.py
@@ -20,7 +20,7 @@ wal = os.path.join(server.vardir, filename)
 
 server.start()
 
-server.admin("space = box.schema.create_space('tweedledum', { id = 0 })")
+server.admin("space = box.schema.space.create('tweedledum', { id = 0 })")
 if os.access(wal_inprogress, os.F_OK):
   print ".xlog.inprogress exists"
 
@@ -144,10 +144,10 @@ wal_old = os.path.join(server.vardir, "old_" + filename)
 wal = os.path.join(server.vardir, filename)
 
 # Create wal#1
-server.admin("space = box.schema.create_space('test')")
-server.admin("index = box.space['test']:create_index('primary')")
-server.admin("box.space['test']:insert{1, 'first tuple'}")
-server.admin("box.space['test']:insert{2, 'second tuple'}")
+server.admin("space = box.schema.space.create('test')")
+server.admin("index = box.space.test:create_index('primary')")
+server.admin("box.space.test:insert{1, 'first tuple'}")
+server.admin("box.space.test:insert{2, 'second tuple'}")
 server.stop()
 
 # Save wal #1
@@ -159,16 +159,16 @@ lsn += 4
 
 # Create another wal#1
 server.start()
-server.admin("space = box.schema.create_space('test')")
-server.admin("index = box.space['test']:create_index('primary')")
-server.admin("box.space['test']:insert{1, 'first tuple'}")
-server.admin("box.space['test']:delete{1}")
+server.admin("space = box.schema.space.create('test')")
+server.admin("index = box.space.test:create_index('primary')")
+server.admin("box.space.test:insert{1, 'first tuple'}")
+server.admin("box.space.test:delete{1}")
 server.stop()
 
 # Create wal#2
 server.start()
-server.admin("box.space['test']:insert{1, 'third tuple'}")
-server.admin("box.space['test']:insert{2, 'fourth tuple'}")
+server.admin("box.space.test:insert{1, 'third tuple'}")
+server.admin("box.space.test:insert{2, 'fourth tuple'}")
 server.stop()
 
 if os.access(wal, os.F_OK):
@@ -186,9 +186,9 @@ if server.logfile_pos.seek_once(line) >= 0:
     print "'%s' exists in server log" % line
 print
 
-server.admin("box.space['test']:get{1}")
-server.admin("box.space['test']:get{2}")
-server.admin("box.space['test']:len()")
+server.admin("box.space.test:get{1}")
+server.admin("box.space.test:get{2}")
+server.admin("box.space.test:len()")
 
 
 #
@@ -199,7 +199,7 @@ server.stop()
 server.deploy()
 
 # Create wal#1
-server.admin("space = box.schema.create_space('test')")
+server.admin("space = box.schema.space.create('test')")
 server.admin("index = box.space.test:create_index('primary')")
 server.admin("box.space.test:insert{1, 'first tuple'}")
 server.admin("box.space.test:insert{2, 'second tuple'}")
@@ -235,7 +235,7 @@ server.stop()
 server.deploy()
 
 # Create wal#1
-server.admin("space = box.schema.create_space('test')")
+server.admin("space = box.schema.space.create('test')")
 server.admin("index = box.space.test:create_index('primary')")
 server.stop()
 server.start()
-- 
GitLab