diff --git a/.gitignore b/.gitignore
index f0d6933f37797510a1af2444366675b46858265f..598ceffdf403b954b18dd47d7af8f0a23b7a3f2e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,8 +51,7 @@ lcov
 src/bootstrap.h
 src/lua/*.lua.c
 src/box/lua/*.lua.c
-src/box/tarantool_box
-src/box/tarantool.cfg
+src/tarantool
 tarantool-*.tar.gz
 test/connector_c/protocol
 test/connector_c/rpl
diff --git a/CMakeLists.txt b/CMakeLists.txt
index aeeed7d25bc6618482162cb6d827c1405b2e0d76..cc491b8547a6b8400843ebafc1bca9ab2663dd60 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,12 +30,6 @@ find_program(LD ld)
 find_program(POD2MAN pod2man)
 
 
-#
-# This instructs the rest of the build system what product
-# and what modules to produce.
-#
-set (TARANTOOL_PRODUCT "box")
-set (TARANTOOL_MODULES "box")
 # Disable tarancheck and tarantar for 1.6
 # set (TARANTOOL_CLIENTS "tarancheck" "tarantar")
 set (TARANTOOL_CLIENTS "")
diff --git a/README.md b/README.md
index 1a9498e35c5c320ffe878a6b6919ace4ec373fd9..b37d9c721077f50e3d3f67a8ceaf7d1ccdb04e50 100644
--- a/README.md
+++ b/README.md
@@ -13,8 +13,6 @@ Key features of the system:
  * lua functions, procedures, triggers, with
    rich access to database API, JSON support,
    inter-procedure and network communication libraries
- * a command line client supporting simple SQL and
-   a native Lua console
 
 Tarantool is ideal for data-enriched components of 
 scalable Web architecture: traditional database caches, queue
@@ -34,8 +32,7 @@ CMake is used for configuration management.
  also provides debugging capabilities
  * Release -- use only if the highest performance is required
 
-The only external library dependency is readline: libreadline-dev
-is required to build the command line client.
+The only external library dependency is readline: libreadline-dev.
 
 There are two OPTIONAL dependencies: 
 - uuid-dev. It is required for box.uuid_* functions.
@@ -57,10 +54,9 @@ To use a different release type, say, RelWithDebugInfo, use:
 
 Additional build options can be set similarly:
 
-    tarantool $ cmake . -DCMAKE_BUILD_TYPE=RelWithDebugInfo -DENABLE_CLIENT=true # builds the command line client.
+    tarantool $ cmake . -DCMAKE_BUILD_TYPE=RelWithDebugInfo -DENABLE_DOC=true # builds the docs
 
-'make' creates tarantool_box executable in directory
-src/box and tarantool executable in client/tarantool.
+'make' creates tarantool executable in directory src/.
 
 There is no 'make install' goal, but no installation
 is required either.
@@ -77,15 +73,14 @@ Once all prerequisites are installed, try:
 
 This will create a 'var' subdirectory in directory 'test',
 populate it with necessary files, and
-start the server. To connect, you could use
-a simple command-line client:
+start the server. To connect, start the server in interactive
+mode:
 
-    tarantool $ ./test/tarantool
+    tarantool $ ./src/tarantool
 
 Alternatively, if a customized server configuration is required,
 you could follow these steps:
 
-
     tarantool $ emacs cfg/tarantool.cfg # edit the configuration
     # Initialize the storage directory, path to this directory
     # is specified in the configuration file:
diff --git a/cmake/package.cmake b/cmake/package.cmake
index 5e98f6dd20a5bd505ea81e74ebef131438e7ff84..62dc2681d15eb6f9211c6f7adc912b522f4a68eb 100644
--- a/cmake/package.cmake
+++ b/cmake/package.cmake
@@ -14,7 +14,7 @@ set (CPACK_SOURCE_IGNORE_FILES
     "CMakeFiles" "\\\\.gz" "\\\\.Z" "\\\\.zip" "\\\\.rpm"
     "\\\\.o" "\\\\.so" "\\\\.a"
     "client/tarantool/tarantool"
-    "src/box/tarantool_box"
+    "src/box/tarantool"
     "install_manifest.txt"
     "cmake_install.cmake" "test/var/"
 )
diff --git a/debian/changelog b/debian/changelog
index a5deced9aba6aa4047a615534c29399d2b10ddb4..5fb7821e9a9bbc83bd9535f2704921efe03212db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,7 +20,7 @@ tarantool (1.5.2.16.g18b8e4e-1) unstable; urgency=low
   * New Debian snapshot.
    - Drop legacy packages (libtarantool*).
    - Drop tarantool-dbg.
-   - Don't strip tarantool_box (it uses debug symbols runtime).
+   - Don't strip tarantool (it uses debug symbols runtime).
 
  -- Dmitry E. Oboukhov <unera@debian.org>  Fri, 20 Dec 2013 15:44:11 +0400
 
diff --git a/debian/rules b/debian/rules
index 79fca0e02ddb8481cbed7fe4d6f430a3963d0c93..0d9a88341388e386de7982a7b5e2ecb9f60a08bc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,7 +31,7 @@ DEB_CMAKE_NORMAL_ARGS := -DCMAKE_INSTALL_PREFIX="$(DEB_CMAKE_INSTALL_PREFIX)" \
 
 DEB_SHLIBDEPS_INCLUDE          := /usr/lib/tarantool/1.6
 DEB_INSTALL_DOCS_ALL 		:= -XTODO -XAUTHORS
-DEB_DH_STRIP_ARGS_tarantool	:= -X/usr/bin/tarantool_box
+DEB_DH_STRIP_ARGS_tarantool	:= -X/usr/bin/tarantool
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
diff --git a/debian/scripts/tarantool_instance b/debian/scripts/tarantool_instance
index bb2131a037602310b5e04a115981bd14ae4bc496..6f34909abcd20fa36069ba74f47cfe04104edf9e 100755
--- a/debian/scripts/tarantool_instance
+++ b/debian/scripts/tarantool_instance
@@ -8,7 +8,7 @@ CONFIG_DIR=/var/lib/tarantool/started
 SNAPSHOT_DIR=/var/lib/tarantool/snapshot
 PID_DIR=/var/run/tarantool
 LOG_DIR=/var/log/tarantool
-BOX=/usr/bin/tarantool_box
+BOX=/usr/bin/tarantool
 SSD=start-stop-daemon
 CFG_DIR=/etc/tarantool/instances.enabled
 
diff --git a/debian/tarantool-common.cron.hourly b/debian/tarantool-common.cron.hourly
index f9854d38a242dd6b0a2fe524b39f2e42b03003ae..666956a48b9e9392bcebf0aa8d0644118b158b2e 100644
--- a/debian/tarantool-common.cron.hourly
+++ b/debian/tarantool-common.cron.hourly
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-test -x /usr/bin/tarantool_box || exit 0
+test -x /usr/bin/tarantool || exit 0
 test -x /usr/sbin/tarantool_snapshot_rotate || exit 0
 
 exec /usr/sbin/tarantool_snapshot_rotate
diff --git a/debian/tarantool-common.tarantool.init b/debian/tarantool-common.tarantool.init
index 664b3d4abfd5ae02829087582d831df877799ca5..6ab11b7b3d8db441a3718578b8cb5979843549c0 100644
--- a/debian/tarantool-common.tarantool.init
+++ b/debian/tarantool-common.tarantool.init
@@ -16,7 +16,7 @@
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 CONF_DIR=/etc/tarantool/instances.enabled
 SCRIPTNAME=/etc/init.d/tarantool
-DAEMON=/usr/bin/tarantool_box
+DAEMON=/usr/bin/tarantool
 INSTANCES=`find $CONF_DIR -xtype f -name '*.cfg'`
 INSTSCRIPT=/usr/sbin/tarantool_instance
 
diff --git a/debian/tarantool.install b/debian/tarantool.install
index 8b674a28a8e6e3447417552401233f6a22ed55a3..cf3778fde0d0496cc81cc52f63cb4eda921a47ab 100644
--- a/debian/tarantool.install
+++ b/debian/tarantool.install
@@ -1,2 +1,2 @@
-usr/bin/tarantool_box
+usr/bin/tarantool
 #usr/bin/tarantar
diff --git a/debian/tarantool.lintian-overrides b/debian/tarantool.lintian-overrides
index 2ac5d38564f4eca9362a5208cf74eafdc91591f7..79de2b236e53ae6dff1c40a7d0a33221e1a1fd18 100644
--- a/debian/tarantool.lintian-overrides
+++ b/debian/tarantool.lintian-overrides
@@ -1 +1 @@
-tarantool: unstripped-binary-or-object usr/bin/tarantool_box
+tarantool: unstripped-binary-or-object usr/bin/tarantool
diff --git a/debian/tarantool.manpages b/debian/tarantool.manpages
index 592df74a51532d4531ee60af65eb0535490cd227..02c5d324134632e642d66f9e7ee910c7d8ce3173 100644
--- a/debian/tarantool.manpages
+++ b/debian/tarantool.manpages
@@ -1,3 +1,3 @@
-build-area/doc/man/tarantool_box.1
+build-area/doc/man/tarantool.1
 #build-area/tarantar.1
 
diff --git a/doc/man/CMakeLists.txt b/doc/man/CMakeLists.txt
index 0c83ef706659c29d011bdf0751ad61166a398f3c..08cecf116b37db38cdbbce074fc9690c4015da5d 100644
--- a/doc/man/CMakeLists.txt
+++ b/doc/man/CMakeLists.txt
@@ -1,11 +1,5 @@
 add_custom_target(man ALL
-    COMMAND ${POD2MAN} -c 'high performance key/value storage server'
-	    ${CMAKE_SOURCE_DIR}/doc/man/tarantool_box.pod > ${PROJECT_BINARY_DIR}/doc/man/tarantool_box.1
-    COMMAND ${POD2MAN} -c 'readline SQL-client for tarantool'
+    COMMAND ${POD2MAN} -c 'Lua application server and NoSQL database'
 	    ${CMAKE_SOURCE_DIR}/doc/man/tarantool.pod > ${PROJECT_BINARY_DIR}/doc/man/tarantool.1
     )
-
-install(FILES ${PROJECT_BINARY_DIR}/doc/man/tarantool_box.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1/)
-if (ENABLE_CLIENT)
-    install(FILES ${PROJECT_BINARY_DIR}/doc/man/tarantool.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1/)
-endif()
+install(FILES ${PROJECT_BINARY_DIR}/doc/man/tarantool.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1/)
diff --git a/doc/man/tarantool.pod b/doc/man/tarantool.pod
index 030c78df83a20e3d0d6e11683e11e7208c66b67a..76b61679bc2ccb27f8a93fb344ca4cd2fd0ad8e8 100644
--- a/doc/man/tarantool.pod
+++ b/doc/man/tarantool.pod
@@ -1,199 +1,70 @@
 =head1 NAME
 
-tarantool - readline-based client for L<tarantool>.
+tarantool- a Lua application server and a NoSQL database
 
 =head1 SYNOPSIS
 
-    tarantool [OPTIONS] [QUERY]
-
-=head1 Command-line options
-
-=over
-
-=item -h, --host <host name>
-
-Server address.
-
-=item -p, --port <port number>
-
-Server port.
-
-=item -a, --admin-port <port number>
-
-Server admin port.
-
-=item -C, --cat <file name>
-
-Print xlog or snapshot file content.
-
-=item -P, --play <file name>
-
-Replay xlog file to the specified server.
-
-=item -S, --space <space number>
-
-Filter by space number.
-
-=item -F, --from <log serial number>
-
-Start xlog file from the specified lsn.
-
-=item -T, --to <log serial number>
-
-Stop on specified xlog lsn.
-
-=item -M, --format <name>
-
-Cat output format (tarantool, raw).
-
-=item -H, --header
-
-Add file header for the raw output.
-
-=item -R, --rpl <log serial number>
-
-Act as replica for the specified server.
-
-=item -B, --bin
-
-Print STR in lua printer instead of NUM32 and NUM64,
-except arithmetic update arguments.
-
-=item -D, --delim <delim>
-
-If you use --cat, then it will add delim to end of
-every line of your Lua file. when used at CLI start
-of client, then it's replacement of setopt
-delim='<delim>' command.
-
-=item -?, --help
-
-Display this help and exit.
-
-=item -V, --version
-
-Display version information and exit.
-
-=back
+    tarantool [OPTIONS]
 
 =head1 DESCRIPTION
- 
-Statements in alphabetical order
 
-Although an initial statement may be entered on the tarantool command line, generally they are entered following the prompt in interactive mode while tarantool is running. (A prompt will be the name of the host and a greater-than sign, for example localhost>). The end-of-statement marker is a newline (line feed).
+Tarantool is a Lua application server and a NoSQL database.
 
-=over
-
-=item CALL
-
-Syntax: CALL procedure-identifier (). Effect: The client tells the server to execute the procedure identified by procedure-identifier. Example: CALL proc50(). Notes: The client sends to the server's read/write data port. 
-
-=item DELETE
-
-Syntax: DELETE FROM tuple-set-name WHERE field-name = literal. Effect: Client tells server to delete the tuple identified by the WHERE clause. Example: DELETE FROM t0 WHERE k0='a'. Notes: field-name must identify the primary key. The client sends to the server's read/write data port after converting from SQL to binary protocol. 
-
-=item EXIT
-
-Syntax: E[XIT]. Effect: The tarantool program stops. Example: EXIT. Notes: The QUIT statement does the same thing. The client sends nothing to the server. 
-
-=item HELP
-
-Syntax: H[ELP]. Effect: Client displays a message including a list of possible statements. Example: HELP. Notes: The client sends nothing to the server. 
-
-=item INSERT
-
-Syntax: INSERT [INTO] tuple-set-identifier VALUES (literal [,literal...]). Effect: The client tells the server to add the tuple consisting of the literal values. Example: INSERT INTO t0 VALUES ('a',0). Notes: The client sends to the server's read/write data port after converting from SQL to binary protocol. 
-
-=item LOADFILE
-
-Syntax: LOADFILE string-literal. Effect: The client loads instructions from the file identified by string-literal. Example: LOADFILE '/home/tarantool_user/file5.txt'. 
-
-=item LUA
-
-Syntax: LUA token [token...]. Effect: The client tells the server to execute the tokens as Lua statements. Example: LUA "hello".." world". Notes: The client sends to the server's administrative port. 
-
-=item PING
-
-Syntax: PING. Effect: The client sends a ping to the server. Example: PING. Notes: The client sends to the server's read/write data port. 
-
-=item QUIT
+Its key properties include:
 
-Syntax: Q[UIT]. Effect: The client stops. This statement is handled entirely by the client. Example: QUIT. Notes: The EXIT statement does the same thing. The client sends nothing to the server. 
-
-=item RELOAD
-
-Syntax: RELOAD CONFIGURATION. Effect: The client tells the server to re-read the configuration file. Example: RELOAD CONFIGURATION. Notes: The client sends to the server's administrative port. 
-
-=item REPLACE
-
-Syntax; REPLACE [INTO] tuple-set-identifier VALUES (literal [,literal...]). Effect: The client tells the server to add the tuple consisting of the literal values. Example: REPLACE INTO t0 VALUES ('a',0). Notes: REPLACE and INSERT are the same, except that INSERT will return an error if a tuple already exists with the same primary key. The client sends to the server's read/write data port after converting from SQL to binary protocol. 
-
-=item SAVE
-
-Syntax: SAVE COREDUMP | SNAPSHOT. Effect: The client tells the server to save the designated object. Example: SAVE SNAPSHOT. Notes: The client sends to the server's administrative port. 
-
-=item SELECT
-
-Syntax: SELECT * FROM tuple-set-identifier WHERE field-identifier = literal [AND|OR field-identifier = literal...] [LIMIT numeric-literal [,numeric-literal]]. Effect: Client tells server to find the tuple or tuples identified in the WHERE clause. Example: SELECT * FROM t0 WHERE k0 = 5 AND k1 = 7 LIMIT 1. Notes: The client sends to the server's read/write data port. 
-
-=item SET
-
-Syntax: SET INJECTION name-token state-token. Effect: In normal mode: error. Notes: This statement is only available in debug mode. 
-
-=item SETOPT
-
-Syntax: SETOPT DELIMITER = string-literal. The string must be a value in single quotes. Effect: string becomes end-of-statement delimiter, so newline alone is not treated as end of statement. Example: SETOPT DELIMITER = '!'. Notes: The client sends nothing to the server.
-
-Syntax: SETOPT PAGER = string-literal. The string must be a value in single quotes. Effect: string becomes the pager that will be invoked for subsequent commands; usually the values are '/usr/bin/less' or '/bin/more' for the common Linux pagers. Example: SETOPT PAGER = '/usr/bin/less'. Notes: The client sends nothing to the server. 
+=over
 
-=item SHOW
+=item *
+    
+Licence: simplified BSD
 
-Syntax: SHOW CONFIGURATION | FIBER | INFO | INJECTIONS | PALLOC | PLUGINS | SLAB | STAT. Effect: The client asks the server for information about environment or statistics. Example: SHOW INFO. Notes: The client sends to the server's administrative port. SHOW INJECTIONS is only available in debug mode. 
+=item *
+    
+All data is maintained in RAM
 
-=item UPDATE
+=item *
+    
+Data persistence is implemented using Write Ahead Log and snapshotting
 
-Syntax: UPDATE tuple-set-identifier SET field-identifier = literal [,field-identifier = literal...] WHERE field-identifier = literal. Effect: Client tells server to change the tuple identified in the WHERE clause. Example: UPDATE t1 SET k1= 'K', k2 = 7 WHERE k0 = 0. Notes: The client sends to the server's read/write data port after converting from SQL to binary protocol. 
+=item *
+    
+Supports asynchronous replication and hot standby
 
-For a condensed Backus-Naur Form [BNF] description of some of the statements, see doc/box-protocol.txt and doc/sql.txt.
+=item *
+    
+Uses coroutines and asynchronous I/O to implement
+high-performance lock-free access to data
 
+=item *
+    
+Available on Linux, FreeBSD, Mac OS X
 
+=item *
+    
+Stored procedures in Lua are supported.
 
 =back
 
-=head1 EXAMPLES
+=head2 Data model
 
+The basic atom of storage in Tarantool is called tuple. A tuple
+can have arbitrary number of fields. The first field or fields 
+in the tuple
+are always the identifying unique key. Tuples form spaces. It is
+possible to search tuples in spaces using the primary or secondary
+keys. It is possible to change, as well as add or remove fields.
 
-Depending how one combines the tarantool client's options, there are in effect three modes of operation: "interactive", "print and play", or "replication" mode.
+=head1 Command-line options
 
-In interactive mode, one types statements and gets results. One can specify a statement file when starting (tarantool < file_name) or one can specify a statement file with the LOADFILE statement: (LOADFILE file_name), but typically the statements are typed in by the user following prompts. Here is an example of an interactive-mode tarantool client session:
+=over
 
- $ tarantool
- localhost> INSERT INTO t0 VALUES ('X-1',100)
- Insert OK, 1 rows affected
- localhost> INSERT INTO t0 VALUES ('X-2',200,'On Order')
- Insert OK, 1 rows affected
- localhost> INSERT INTO t0 VALUES ('X-3',300,'')
- Insert OK, 1 rows affected
- localhost> UPDATE t0 SET k1 = 300 WHERE k0 = 'X-1'
- Update OK, 1 rows affected
- localhost> DELETE FROM t0 WHERE k0 = 'X-2'
- Delete OK, 1 rows affected
- localhost> SELECT * FROM t0 WHERE k0 = 'X-1'
- Select OK, 1 rows affected
- ['X-1', 300]
- localhost> EXIT
- $ 
+=item -h, --help
 
-In print and play mode, one uses --cat and --play and --from and --to and --space options to print write-ahead-log contents, or to send write-ahead-log contents to the server. Here is an example of a print-and-play-mode tarantool client session:
+Displays helpscreen and exits.
 
- $ tarantool --cat /home/user1/tarantool_test/work_dir/00000000000000000005.xlog --from 22 --to 26
- Insert, lsn: 22, time: 1385327353.345869, len: 33, space: 0, cookie: 127.0.0.1:44787 ['X-1', 100]
- Insert, lsn: 23, time: 1385327353.346745, len: 42, space: 0, cookie: 127.0.0.1:44787 ['X-2', 200, 8243105135088135759]
- Insert, lsn: 24, time: 1385327353.347352, len: 34, space: 0, cookie: 127.0.0.1:44787 ['X-3', 300, '']
- Update, lsn: 25, time: 1385327353.348209, len: 42, space: 0, cookie: 127.0.0.1:44787 ['X-1']
- Delete, lsn: 26, time: 1385327353.348879, len: 28, space: 0, cookie: 127.0.0.1:44787 ['X-2']
- $ 
+=item -V, --version
 
-In replication mode, one connects as a replica, and then writes a binary log to a file. 
+Prints program version and exits.
 
+=back
 
diff --git a/doc/man/tarantool_box.pod b/doc/man/tarantool_box.pod
deleted file mode 100644
index e48a14931d43b02ef63d7ad14a502e2e25c4ebcd..0000000000000000000000000000000000000000
--- a/doc/man/tarantool_box.pod
+++ /dev/null
@@ -1,100 +0,0 @@
-=head1 NAME
-
-tarantool_box - open-source NoSQL database
-
-=head1 SYNOPSIS
-
-    tarantool_box [OPTIONS]
-
-=head1 DESCRIPTION
-
-Tarantool is an open-source NoSQL database, developed by Mail.ru.
-
-Its key properties include:
-
-=over
-
-=item *
-    
-Licence: simplified BSD
-
-=item *
-    
-All data is maintained in RAM
-
-=item *
-    
-Data persistence is implemented using Write Ahead Log and snapshotting
-
-=item *
-    
-Supports asynchronous replication and hot standby
-
-=item *
-    
-Uses coroutines and asynchronous I/O to implement
-high-performance lock-free access to data
-
-=item *
-    
-Available on Linux and FreeBSD
-
-=item *
-    
-Stored procedures in Lua are supported.
-
-=back
-
-=head2 Data model
-
-The basic atom of storage in Tarantool is called tuple. A tuple
-can have arbitrary number of fields. The first field in the tuple
-is always the identifying unique key. Tuples form spaces. It is
-possible to search tuples in spaces using the primary or secondary
-keys. Fields in a tuple are type-agnostic. It is possible to change,
-as well as add or remove fields.
-
-=head1 Command-line options
-
-=over
-
-=item --cfg-get=KEY
-
-Returns a value from configuration file described by B<KEY>.
-
-=item --check-config
-
-Checks configuration file for errors.
-
-=item -c FILE, --config=FILE
-
-Points a path to configuration file (default: B</etc/tarantool.cfg>).
-
-=item --cat=FILE
-
-Cats snapshot file to stdout in readable format and exits.
-
-=item --init-storage
-
-Initializes storage (an empty snapshot file) and exits.
-
-=item -v, --verbose
-
-Increases verbosity level in log messages.
-
-=item -B, --background
-
-Redirects input/output streams to a log file and runs as
-daemon.
-
-=item -h, --help
-
-Displays helpscreen and exits.
-
-=item -V, --version
-
-Prints program version and exits.
-
-=back
-
-
diff --git a/doc/user/configuration-reference.xml b/doc/user/configuration-reference.xml
index 9d770a00e29969141725b9c90605b218a76d6d9c..d7db9b0cde11f4cdde63d6294059c07baf11862f 100644
--- a/doc/user/configuration-reference.xml
+++ b/doc/user/configuration-reference.xml
@@ -49,7 +49,7 @@ both.
     <listitem xml:id="version-option">
       <para><option>--version</option>, <option>-V</option></para>
       <para>Print product name and version, for example:
-        <programlisting><prompt>$ </prompt> ./tarantool_box --version
+        <programlisting><prompt>$ </prompt> ./tarantool --version
 Tarantool 1.4.0-69-g45551dd
         </programlisting>
         In this example:
@@ -118,7 +118,7 @@ Tarantool 1.4.0-69-g45551dd
         incorrect, an error is returned. If the option
         is not explicitly specified, its default value is used
         instead. Example:
-        <programlisting><prompt>$ </prompt>./tarantool_box --cfg-get=admin_port
+        <programlisting><prompt>$ </prompt>./tarantool --cfg-get=admin_port
 33015   </programlisting>
       </para>
     </listitem>
@@ -359,11 +359,11 @@ Tarantool 1.4.0-69-g45551dd
              ordinarily <command>ps</command> shows the Tarantool server process thus:
             </para>
 <programlisting>kostja@shmita:~$ ps -a -o command | grep box
-tarantool_box: primary pri: 3301 adm: 33015</programlisting>
+tarantool: primary pri: 3301 adm: 33015</programlisting>
           <para>But if the configuration file contains custom_proc_title=sessions then
           the output looks like:</para>
 <programlisting>kostja@shmita:~$ ps -a -o command | grep box
-tarantool_box: primary@sessions pri: 3301 adm: 33015</programlisting>
+tarantool: primary@sessions pri: 3301 adm: 33015</programlisting>
           </entry>
         </row>
 
diff --git a/doc/user/connectors.xml b/doc/user/connectors.xml
index e6f38cc4b7f2bcb0b185ef324f9a526467344dab..8e7b9ce36ea239fe68ddaf50e082f99117dafc91 100644
--- a/doc/user/connectors.xml
+++ b/doc/user/connectors.xml
@@ -93,7 +93,7 @@ is in file <link xlink:href="https://github.com/tarantool/tarantool/blob/master/
                     </tgroup>
                 </informaltable>
 <para>
-Now, one could send that packet to the tarantool_box server,
+Now, one could send that packet to the tarantool server,
 and interpret the response (box-protocol.txt has a description
 of the packet format for responses as well as requests).
 But it would be easier, and less error-prone, if one could
@@ -113,11 +113,11 @@ And that is why APIs exist for drivers for C, Perl, Python, PHP, Ruby, and so on
     the necessary file <filename>tp.h</filename>, and the default library path contains
     the directory where Tarantool library files were placed at installation time.
     Before trying to run, check that the server
-    (tarantool_box) is running on localhost (127.0.0.1) and its primary port is the default (3301) and
+    (tarantool) is running on localhost (127.0.0.1) and its primary port is the default (3301) and
     space[0]'s primary key type is numeric (space[0].index[0].key_field[0].type = "NUM" in configuration file).
     To run, say <code>./example</code>.
     The program will format a buffer for sending an INSERT request, then open a socket connection
-    with the tarantool_box server at localhost:3301, then send the request, then check if the
+    with the tarantool server at localhost:3301, then send the request, then check if the
     server returned an error, then &mdash; if all is well &mdash; print "Insert succeeded". If the
     row already exists, the program will print <quote>Duplicate key exists in unique index 0</quote>.
     </para>
@@ -226,14 +226,14 @@ sudo cpan install DR::Tarantool
     <para>
     Here is a complete Perl program that inserts [99999,'BB'] into space[0] via the Perl API.
     Before trying to run, check that the server
-    (tarantool_box) is running on localhost (127.0.0.1) and its primary port is the default (3301) and
+    (tarantool) is running on localhost (127.0.0.1) and its primary port is the default (3301) and
     space[0]'s primary key type is numeric (space[0].index[0].key_field[0].type = "NUM" in configuration file).
     To run, paste the code into a file named example.pl and say <code>perl example.pl</code>.
     The program will connect using an application-specific definition of the space.
     The program will open a socket connection
-    with the tarantool_box server at localhost:3301, then send an INSERT request,
+    with the tarantool server at localhost:3301, then send an INSERT request,
     then &mdash; if all is well &mdash; end without displaying any messages.
-    If tarantool_box is not running on localhost with primary port = 3301, the program will print
+    If tarantool is not running on localhost with primary port = 3301, the program will print
     <quote>Connection refused</quote>.
     </para>
     <para>
@@ -243,8 +243,8 @@ use DR::Tarantool ':constant', 'tarantool';
 use DR::Tarantool ':all';
 
 my $tnt = tarantool
-  host    =&gt; '127.0.0.1',                      # look for tarantool_box on localhost
-  port    =&gt; 3301,                             # assume tarantool_box primary port = default
+  host    =&gt; '127.0.0.1',                      # look for tarantool on localhost
+  port    =&gt; 3301,                             # assume tarantool primary port = default
   spaces  =&gt; {
     0 =&gt; {                                     # definition of space[0] ...
       name =&gt; 't0',                            #   space[0] name = 't0'
@@ -302,11 +302,11 @@ export PHP_INI_SCAN_DIR=~/tarantool-php/test/share
     <para>
     Here is a complete PHP program that inserts [99999,'BB'] into space[0] via the PHP API.
     Before trying to run, check that the server
-    (tarantool_box) is running on localhost (127.0.0.1) and its primary port is the default (3301) and
+    (tarantool) is running on localhost (127.0.0.1) and its primary port is the default (3301) and
     space[0]'s primary key type is numeric (space[0].index[0].key_field[0].type = "NUM" in configuration file).
     To run, paste the code into a file named example.php and say <code>php example.php</code>.
     The program will open a socket connection
-    with the tarantool_box server at localhost:3301, then send an INSERT request,
+    with the tarantool server at localhost:3301, then send an INSERT request,
     then &mdash; if all is well &mdash; print "Insert succeeded".
     If the tuple already exists, the program will print <quote>Duplicate key exists in unique index 0</quote>.
     </para>
@@ -340,7 +340,7 @@ catch (Exception $e) {
     <userinput><code>pip install tarantool</code></userinput> to install in <filename>/usr</filename> (requires root privilege)
     or
     <userinput><code>pip install tarantool --user</code></userinput> to install in <filename>~</filename> i.e. user's default directory.
-    Before trying to run, check that the server (tarantool_box) is running on localhost (127.0.0.1) and its primary port
+    Before trying to run, check that the server (tarantool) is running on localhost (127.0.0.1) and its primary port
     is the default (3301) and space[0]'s primary key type is string (space[0].index[0].key_field[0].type = "STR" in configuration file).
     To run, say <code>python example.py</code>.
     The program will connect to the server, will send the request, and will not throw an exception if all went well.
diff --git a/doc/user/lua-tutorial.xml b/doc/user/lua-tutorial.xml
index a7dac31ce45afd717d1aed0d21f2497e2d264474..ddf297c4823bc7f3cf9f98108d8738f3f4a91b85 100644
--- a/doc/user/lua-tutorial.xml
+++ b/doc/user/lua-tutorial.xml
@@ -33,7 +33,7 @@ in with the tarantool client while reading along.
 We are going to use the "tarantool_sandbox" that was created in section
 <olink targetptr="getting-started-start-stop">Starting Tarantool and making your first database</olink>.
 So there is a single space, and a numeric primary key,
-a running tarantool_box server, and a running tarantool client.
+a running tarantool server, and a running tarantool client.
 </para>
 
 <para>
diff --git a/doc/user/plugins.xml b/doc/user/plugins.xml
index 56dc441b2fc739d6781e810f668359fd783970c6..dee8c756402214d5bc275ccaeeacb0af6a571f5c 100644
--- a/doc/user/plugins.xml
+++ b/doc/user/plugins.xml
@@ -145,7 +145,7 @@ error("net.sql load failed")
 end
 require("box.net.mysql")
 
-# Now, to help tarantool_box find the essential mysql.so file, execute these lines:
+# Now, to help tarantool find the essential mysql.so file, execute these lines:
 <userinput>cd /home/pgulutzan/tarantool_test</userinput>
 <userinput>mkdir box</userinput>
 <userinput>mkdir box/net</userinput>
@@ -154,7 +154,7 @@ require("box.net.mysql")
 # Start the Tarantool server.
 # Run it in the background but let the initial display be in the foreground.
 # So it's possible to see the message that the plugin was loaded.
-<prompt>$ </prompt><userinput>~/tarantool-stable/src/box/tarantool_box&amp;</userinput>
+<prompt>$ </prompt><userinput>~/tarantool-stable/src/box/tarantool&amp;</userinput>
 2013-12-03 17:46:16.239 [12957] 1/sched C&gt; version 1.5.1-271-g610930e
 ... loading /home/pgulutzan/tarantool_test/init.lua ...
 ...
@@ -273,7 +273,7 @@ Linking CXX shared library libpg.so
 # Start the Tarantool server.
 # Run it in the background but let the initial display be in the foreground.
 # So it's possible to see the message that the plugin was loaded.
-<prompt>$ </prompt><userinput>~/tarantool-stable/src/box/tarantool_box&amp;</userinput>
+<prompt>$ </prompt><userinput>~/tarantool-stable/src/box/tarantool&amp;</userinput>
 2013-12-06 13:01:51.518 [23978] 1/sched C> version 1.5.1-290-g45b93e7
 ... Loading plugin: ~/tarantool-stable/src/plugin/pg/libpg.so ...
 ... Plugin 'postgresql' was loaded, version: 1
diff --git a/doc/user/preface.xml b/doc/user/preface.xml
index 473f4d12beffcc9c58bbcc2410c3c44af38b1d0b..96cd929902494088165fd5e4a5b0e255f4bc3cd9 100644
--- a/doc/user/preface.xml
+++ b/doc/user/preface.xml
@@ -129,7 +129,7 @@
   <para>
     UNIX shell command input is prefixed with '$ ' and is in
     a fixed-width font:
-    <programlisting><prompt>$ </prompt>tarantool_box <option>--background</option></programlisting>
+    <programlisting><prompt>$ </prompt>tarantool <option>--background</option></programlisting>
   </para>
   <para>
     File names are also in a fixed-width font:
@@ -141,7 +141,7 @@
   </para>
   <para>
     Within user input, replaceable items are in italics:
-    <programlisting><prompt>$ </prompt><userinput>tarantool_box <replaceable>--option</replaceable></userinput></programlisting>
+    <programlisting><prompt>$ </prompt><userinput>tarantool <replaceable>--option</replaceable></userinput></programlisting>
   </para>
 </section>
 <section xml:id="reporting-bugs">
diff --git a/doc/user/proctitle.xml b/doc/user/proctitle.xml
index 4438caddcd44835f2f6f95d87efe35ff7a8c404d..5476dce8bc6aa0aa518c07ee5ef855b091996db7 100644
--- a/doc/user/proctitle.xml
+++ b/doc/user/proctitle.xml
@@ -22,7 +22,7 @@
 </para>
 <para>
   <emphasis role="strong">program_name</emphasis> is typically
-  <command>tarantool_box</command>. The role can be one of the
+  <command>tarantool</command>. The role can be one of the
   following:
   <itemizedlist>
     <listitem><para>
@@ -50,10 +50,10 @@
   For example:
   <itemizedlist>
     <listitem><para>
-      <command>tarantool_box: primary pri: 50000 sec: 50001 adm: 50002</command>
+      <command>tarantool: primary pri: 50000 sec: 50001 adm: 50002</command>
     </para></listitem>
     <listitem><para>
-      <command>tarantool_box: primary@infobox pri: 15013 sec: 15523 adm: 10012</command>
+      <command>tarantool: primary@infobox pri: 15013 sec: 15523 adm: 10012</command>
     </para></listitem>
   </itemizedlist>
 </para>
diff --git a/doc/user/server-administration.xml b/doc/user/server-administration.xml
index 3246040c35bd198f50924d154fad8e9a31c0ccab..56d872ad18978df6ce0d4b8abbc98223a8c07793 100644
--- a/doc/user/server-administration.xml
+++ b/doc/user/server-administration.xml
@@ -390,7 +390,7 @@ complete and up-to-date on-disk backup.  This consists of snapshot
 files (extension .snap) which are copies of the database as of the
 time the snapshot was taken, and write-ahead-log files (extension
 .xlog) which contain records of insert/update/delete operations that
-are written when the operations occur. If the tarantool_box server
+are written when the operations occur. If the tarantool server
 goes down and later restarts, it will recover the database by
 reading the snapshot and then re-applying the write-ahead-log records.
 </para>
@@ -415,7 +415,7 @@ is not always the ideal method.
 Taking snapshots with tarantar, instead of with box.snapshot(),
 can be better because:
 <itemizedlist>
-  <listitem><para>tarantar can work even if the tarantool_box server is down
+  <listitem><para>tarantar can work even if the tarantool server is down
   because it works from the existing .snap and .xlog files,
    rather than from an in-memory database.</para></listitem>
    <listitem><para>tarantar saves memory when constructing its own in-memory
@@ -496,13 +496,13 @@ last xlog lsn: 0
 <title>Utility <code>tarantool_deploy</code></title>
 <para>
 With tarantool_deploy one can set up so that, during system boot,
-one or more instances of the tarantool_box server will start.
+one or more instances of the tarantool server will start.
 This utility is for use on Red Hat or CentOS where Tarantool
 was installed using <code>rpm --install</code>.
 </para>
 <para>
 Technically, tarantool_deploy will place instructions in <filename>/etc/init.d</filename>
-which will initiate tarantool_box with appropriate options and
+which will initiate tarantool with appropriate options and
 with settings that maximize resource usage.
 The root password is necessary. These options are available,
 as shown by <code>tarantool_deploy --help</code>:
@@ -525,7 +525,7 @@ usage: tarantool_deploy.sh [options] &lt;instance&gt;
 <para>
 The default prefixes (<filename>/usr</filename> and <filename>/etc</filename> and <filename>/var</filename>) are appropriate
 if a Tarantool installation was done with default settings,
-for example tarantool_box should be in <filename>/usr/bin</filename>.
+for example tarantool should be in <filename>/usr/bin</filename>.
 The only necessary argument is the "instance", which is an
 arbitrary numeric identification formatted as digit.digit.
 The following is a sample run:
diff --git a/doc/user/stored-procedures.xml b/doc/user/stored-procedures.xml
index 8dc2f1d9a4160fe05f058373bbe6cb393612c8ce..ad2f06419a76975a13cc456d26b7d23a8448935c 100644
--- a/doc/user/stored-procedures.xml
+++ b/doc/user/stored-procedures.xml
@@ -3502,7 +3502,7 @@ end
         One variant, <code>box.net.sql</code>, is for connecting to MySQL or MariaDB or PostgreSQL
         &mdash; that variant is the subject of the <quote>SQL DBMS plugins</quote> appendix.
         In this section the subject is the built-in variant, <code>box.net.box</code>.
-        This is for connecting to tarantool_box servers via a network.
+        This is for connecting to tarantool servers via a network.
     </para>
 <variablelist xml:id="box.net.box">
     <para>
@@ -3547,7 +3547,7 @@ end
                 requests, such as select, update or delete.
             </para>
             <para>
-               For the local tarantool_box server there is a pre-created always-established
+               For the local tarantool server there is a pre-created always-established
                connection object named <code>box.net.self</code>.
                Its purpose is to make polymorphic use of the
                <code>box.net.box</code> API easier. Therefore
@@ -3710,7 +3710,7 @@ end
  This example will work with the sandbox configuration described in the preface.
  That is, there is a space named space0 with a numeric primary key.
  Assume that the database is nearly empty.
- Assume that the tarantool_box server is running on localhost 127.0.0.1:3301.
+ Assume that the tarantool server is running on localhost 127.0.0.1:3301.
 <programlisting>
 <prompt>localhost&gt;</prompt><userinput> ta = {}</userinput>
 ---
diff --git a/doc/user/tutorial.xml b/doc/user/tutorial.xml
index 5ac2cb61cb90dc0335fa7088d6f83ae44f591662..8197556d797fa124e99d2b3d27c57a0b69f5ffc3 100644
--- a/doc/user/tutorial.xml
+++ b/doc/user/tutorial.xml
@@ -481,22 +481,22 @@ which make a minimal configuration file that will be suitable for day one.
 Initialize the storage area.
 You only have to do this once.<programlisting>
 #if you downloaded a binary with apt-get or yum, say this:
-  <command>/usr/bin/tarantool_box --init-storage</command>
+  <command>/usr/bin/tarantool --init-storage</command>
 #if you downloaded and untarred a binary tarball to ~/tarantool, say this:
-  <command>~/tarantool/bin/tarantool_box --init-storage</command>
+  <command>~/tarantool/bin/tarantool --init-storage</command>
 #if you built from a source download, say this:
-  <command>~/tarantool/src/box/tarantool_box --init-storage</command></programlisting>
+  <command>~/tarantool/src/box/tarantool --init-storage</command></programlisting>
 </para>
 
 <para>
 Start the server.
-The server name is <computeroutput><filename>tarantool_box</filename></computeroutput>.<programlisting>
+The server name is <computeroutput><filename>tarantool</filename></computeroutput>.<programlisting>
 #if you downloaded a binary with apt-get or yum, say this:
-  <command>/usr/bin/tarantool_box</command>
+  <command>/usr/bin/tarantool</command>
 #if you downloaded and untarred a binary tarball to ~/tarantool, say this:
-  <command>~/tarantool/bin/tarantool_box</command>
+  <command>~/tarantool/bin/tarantool</command>
 #if you built from a source download, say this:
-  <command>~/tarantool/src/box/tarantool_box</command> </programlisting>
+  <command>~/tarantool/src/box/tarantool</command> </programlisting>
 </para>
 
 <para>
@@ -517,16 +517,16 @@ Now take the server down, with <programlisting><keycombo><keysym>Ctrl</keysym><k
 <para>
 Now start the server again. This time start it in the background.<programlisting>
 #if you downloaded a binary with apt-get or yum, say this:
-  <command>/usr/bin/tarantool_box --background</command>
+  <command>/usr/bin/tarantool --background</command>
 #if you downloaded and untarred a binary tarball to ~/tarantool, say this:
-  <command>~/tarantool/bin/tarantool_box --background</command>
+  <command>~/tarantool/bin/tarantool --background</command>
 #if you built from a source download, say this:
-  <command>~/tarantool/src/box/tarantool_box --background</command></programlisting>
+  <command>~/tarantool/src/box/tarantool --background</command></programlisting>
 </para>
 
 <para>
 If all went well, there is now an instance of the Tarantool server
-	running in the background. You can confirm that with the command:<programlisting><command>ps</command> <option>-A</option> | <command>grep</command> tarantool_box</programlisting>
+	running in the background. You can confirm that with the command:<programlisting><command>ps</command> <option>-A</option> | <command>grep</command> tarantool</programlisting>
 	or look at the log file:<programlisting><command>less</command> work_dir/tarantool.log</programlisting>
 </para>
 
@@ -607,7 +607,7 @@ You can repeat box.space...:insert() and box.space...:select() indefinitely.
 When the testing is over:
 To drop the space: <computeroutput>s:drop()</computeroutput>.
 To stop the client:  <keycombo><keysym>Ctrl</keysym><keysym>C</keysym></keycombo>.
-To stop the server: <computeroutput><command>sudo pkill</command> -f tarantool_box</computeroutput>.
+To stop the server: <computeroutput><command>sudo pkill</command> -f tarantool</computeroutput>.
 To destroy the test: <computeroutput><command>rm</command> -r ~/tarantool_sandbox</computeroutput>.
 </para>
 
@@ -721,7 +721,7 @@ inserted and selected tuples with the Tarantool client.
   <para>TARANTOOL = A SCRIPT PROCESSOR.
     Instead of processing scripts with bash or Perl, use tarantool server.
     For example, let the first line of a shell script be
-    <computeroutput>#!/usr/bin/tarantool_box</computeroutput>.
+    <computeroutput>#!/usr/bin/tarantool</computeroutput>.
     This will be a
     (<link xlink:href="https://en.wikipedia.org/wiki/Shebang_%28Unix%29" xlink:title="wikipedia.org/Shebang">"Hashbang" hint</link>)
     that Tarantool will be the script processor.
diff --git a/extra/CMakeLists.txt b/extra/CMakeLists.txt
index 49991a5bce78c2ff66c8293cb8301cb5ab041894..b1f48f2dff192f4c2d5c0c5d626e6cf7f8931e62 100644
--- a/extra/CMakeLists.txt
+++ b/extra/CMakeLists.txt
@@ -26,7 +26,7 @@ endif()
 configure_file(rpm.spec.in rpm.spec @ONLY)
 
 if (TARGET_OS_DARWIN)
-	# NOTE: need add execution 'plutil -lint org.tarantool.tarantool_${TARANTOOL_PRODUCT}.plist
+	# NOTE: need add execution 'plutil -lint org.tarantool.tarantool.plist
 	# to check syntax of plist file.
 	# Also cmake doesn't support changing package id from 'com.' to 'org.'
 	# Need chage to 'org.' after update lines this file:
@@ -35,7 +35,7 @@ if (TARGET_OS_DARWIN)
 	# ^^^ DO NOT CHANGE DARWIN_PACKAGE_ID BEFORE SEE URL ABOVE ^^^
 	#
 	set (DARWIN_PACKAGE_ID "com")
-	set (LUANCHD_PLIST "${DARWIN_PACKAGE_ID}.${CPACK_PACKAGE_VENDOR}.tarantool_${TARANTOOL_PRODUCT}.plist")
+	set (LUANCHD_PLIST "${DARWIN_PACKAGE_ID}.${CPACK_PACKAGE_VENDOR}.tarantool.plist")
 	# Configure scripts for *.pkg and luanchd daemon by templates
 	configure_file(dmg/postflight.in postflight @ONLY)
 	configure_file(org.tarantool.in ${LUANCHD_PLIST} @ONLY)
diff --git a/extra/org.tarantool.in b/extra/org.tarantool.in
index 86cbb75cdac91383d11b60ef9d9ef99e00768812..4def044dfd2dacd5a1f33f0885dfaba035eee6f5 100644
--- a/extra/org.tarantool.in
+++ b/extra/org.tarantool.in
@@ -3,9 +3,9 @@
 <plist version="1.0">
 <dict>
     <key>StandardOutPath</key>
-    <string>/var/log/tarantool_@TARANTOOL_PRODUCT@.log</string>
+    <string>/var/log/tarantool.log</string>
     <key>StandardErrorPath</key>
-    <string>/var/log/tarantool_@TARANTOOL_PRODUCT@.log</string>
+    <string>/var/log/tarantool.log</string>
     <key>WorkingDirectory</key>
     <string>@CMAKE_INSTALL_PREFIX@</string>
     <key>EnvironmentVariables</key>
@@ -19,11 +19,10 @@
         <false/>
     </dict>
     <key>Label</key>
-    <string>@DARWIN_PACKAGE_ID@.@CPACK_PACKAGE_VENDOR@.tarantool_@TARANTOOL_PRODUCT@</string>
+    <string>@DARWIN_PACKAGE_ID@.@CPACK_PACKAGE_VENDOR@.tarantool</string>
     <key>ProgramArguments</key>
     <array>
-        <string>tarantool_@TARANTOOL_PRODUCT@</string>
-	<string>--config=@CMAKE_INSTALL_PREFIX@/etc/tarantool.cfg</string>
+        <string>tarantool</string>
     </array>
     <key>RunAtLoad</key>
     <true/>
diff --git a/extra/rpm.spec.in b/extra/rpm.spec.in
index 596b81b777b00c0d3a139a7c1ca5fd42c697ee62..a05cde21c60af7b1ae54e784876e0aa7bad99c30 100644
--- a/extra/rpm.spec.in
+++ b/extra/rpm.spec.in
@@ -161,12 +161,12 @@ useradd -r -g tarantool tarantool > /dev/null 2>&1
 "%{_datadir}/doc/tarantool/README.md"
 "%{_datadir}/doc/tarantool/LICENSE"
 "%{_datadir}/doc/tarantool/box-protocol.txt"
-"%{_mandir}/man1/tarantool_box.1.gz"
+"%{_mandir}/man1/tarantool.1.gz"
 
-"%{_bindir}/tarantool_box"
+"%{_bindir}/tarantool"
 "%{_bindir}/tarantool_multi.sh"
 "%{_bindir}/tarantool_deploy.sh"
-"/etc/init.d/tarantool_box"
+"/etc/init.d/tarantool"
 
 %dir "%{_sysconfdir}/tarantool"
 
diff --git a/extra/tarantool_deploy.sh b/extra/tarantool_deploy.sh
index 0a992fecf891a7413ad4db907e5035df12212ba1..312ba32620324109ffc7645f4eaaf80130bd5a0a 100755
--- a/extra/tarantool_deploy.sh
+++ b/extra/tarantool_deploy.sh
@@ -66,11 +66,11 @@ usage() {
 
 rollback_instance() {
 	id=$1
-	workdir="${prefix_var}/tarantool_box$id"
-	config="${prefix_etc}/tarantool/tarantool_box$id.cfg"
+	workdir="${prefix_var}/tarantool$id"
+	config="${prefix_etc}/tarantool/tarantool$id.cfg"
 	rm -rf $workdir
 	rm -f $config
-	rm -f "${prefix}/bin/tarantool_box$id.sh"
+	rm -f "${prefix}/bin/tarantool$id.sh"
 	rm -f "${prefix_etc}/init.d/tarantool_box$id"
 }
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 558922685e374e3a4219f35c3439820b37ca762e..81d2ad64f16fcc2af35aa8eb1d095d6b32492d64 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -36,15 +36,8 @@ add_custom_target(generate_lua_sources
     DEPENDS ${lua_sources})
 set_property(DIRECTORY PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${lua_sources})
 
-#
-# Used by modules.
-#
-set (recompiled_sources
-     ${CMAKE_SOURCE_DIR}/src/tarantool.cc
-     ${CMAKE_SOURCE_DIR}/src/lua/init.cc
-     ${CMAKE_SOURCE_DIR}/src/replication.cc)
-
 set (common_sources
+     replication.cc
      memory.cc
      fiber.cc
      util.cc
@@ -83,6 +76,7 @@ set (common_sources
      cpu_feature.c
      fiob.c
      ffisyms.cc
+     lua/init.cc
      lua/fiber.cc
      lua/trigger.cc
      lua/admin.cc
@@ -106,9 +100,8 @@ endif()
 
 set_source_files_compile_flags(${common_sources})
 add_library(core STATIC ${common_sources})
-add_dependencies(core generate_headers)
 
-set (common_libraries core small salad)
+set (common_libraries core small salad misc bitset msgpuck)
 
 list(APPEND common_libraries
     ${LIBEV_LIBRARIES}
@@ -119,7 +112,6 @@ list(APPEND common_libraries
     ${LIBYAML_LIBRARIES}
     ${READLINE_LIBRARIES}
     ${LUAJIT_LIB}
-    misc
 )
 
 set (THREAD_LIB pthread)
@@ -156,35 +148,22 @@ endif()
 set (common_libraries ${common_libraries} PARENT_SCOPE)
 
 add_subdirectory(lib)
+add_subdirectory(box)
 # Save CMAKE_XXX_FLAGS from this directory for config.h (used in --version)
 set(TARANTOOL_C_FLAGS ${CMAKE_C_FLAGS} PARENT_SCOPE)
 set(TARANTOOL_CXX_FLAGS ${CMAKE_CXX_FLAGS} PARENT_SCOPE)
 
-function(tarantool_module mod)
-    set (module_sources ${ARGN})
-    add_executable(tarantool_${mod} ${module_sources})
-
-    set_source_files_compile_flags(
-        ${recompiled_sources} ${module_sources})
-
-    add_library(lt${mod} STATIC ${recompiled_sources})
-    add_dependencies(lt${mod} generate_headers generate_admin_cc build_bundled_libs)
-
-    target_link_libraries(tarantool_${mod} lt${mod} ${common_libraries} -rdynamic)
-
-    if (ENABLE_STATIC)
-        set_target_properties(tarantool_${mod} PROPERTIES
-            LINK_SEARCH_END_STATIC ON)
-        set (module_link_flags "${module_link_flags} -static")
-    endif()
-
-    if (module_link_flags)
-        set_target_properties(tarantool_${mod} PROPERTIES
-            LINK_FLAGS ${module_link_flags})
-    endif()
-    install (TARGETS tarantool_${mod} DESTINATION bin)
-endfunction()
+add_executable(tarantool tarantool.cc)
+add_dependencies(tarantool build_bundled_libs)
+target_link_libraries(tarantool box ${common_libraries} -rdynamic)
+if (ENABLE_STATIC)
+    set_target_properties(tarantool PROPERTIES
+        LINK_SEARCH_END_STATIC ON)
+    set (module_link_flags "${module_link_flags} -static")
+endif()
 
-foreach (module ${TARANTOOL_MODULES})
-add_subdirectory(${module})
-endforeach()
+if (module_link_flags)
+    set_target_properties(tarantool PROPERTIES
+        LINK_FLAGS ${module_link_flags})
+endif()
+install (TARGETS tarantool DESTINATION bin)
diff --git a/src/box/CMakeLists.txt b/src/box/CMakeLists.txt
index a37523dceaf7190a287ccd3bc967eaf7f281c6b3..beea2c89dd5bd085e846421e1e26ccb9ef4f4fe1 100644
--- a/src/box/CMakeLists.txt
+++ b/src/box/CMakeLists.txt
@@ -16,7 +16,7 @@ add_custom_target(box_generate_lua_sources
     DEPENDS ${lua_sources})
 set_property(DIRECTORY PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${lua_sources})
 
-tarantool_module("box"
+add_library(box
     tuple.cc
     tuple_convert.cc
     tuple_update.cc
@@ -43,4 +43,3 @@ tarantool_module("box"
     lua/index.cc
     lua/space.cc)
 
-target_link_libraries(tarantool_box bitset msgpuck)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 853fe1c8705f77f4e40c2e35c9cecfdec95c746b..5e64a1f96ab55bf1975e69ea89e7886172a3c120 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -13,23 +13,11 @@ add_subdirectory(unit)
 # Disable connector_c for 1.6
 #add_subdirectory(connector_c)
 
-macro(install_cfg type_cfg dest)
-    install (FILES ${CMAKE_SOURCE_DIR}/test/share/tarantool_${type_cfg}.cfg
-             DESTINATION ${dest}
-             RENAME "tarantool.cfg")
-endmacro(install_cfg)
-
 if (ENABLE_RPM)
-    install_cfg(rpm ${CMAKE_INSTALL_SYSCONFDIR}/tarantool/)
     install (FILES ${CMAKE_SOURCE_DIR}/src/bootstrap.snap
              DESTINATION ${CMAKE_INSTALL_DATADIR}/tarantool
              RENAME 00000000000000000001.snap)
 else()
-    if (TARGET_OS_DARWIN)
-        install_cfg(dmg ${CMAKE_INSTALL_SYSCONFDIR})
-    else()
-        install_cfg(tgz ${CMAKE_INSTALL_SYSCONFDIR})
-    endif()
     install (FILES ${CMAKE_SOURCE_DIR}/src/bootstrap.snap
              DESTINATION "${CMAKE_INSTALL_LOCALSTATEDIR}/lib/tarantool"
              RENAME 00000000000000000001.snap)
diff --git a/test/big/big.lua b/test/big/big.lua
index 5321dd281a94917a41108284ca1c629c01bb07cd..2cb5be418382fe47fd897a144710d07e130a812f 100644
--- a/test/big/big.lua
+++ b/test/big/big.lua
@@ -1,4 +1,4 @@
-#!/usr/bin/env tarantool_box
+#!/usr/bin/env tarantool
 
 box.cfg{
     primary_port        = os.getenv("PRIMARY_PORT"),
diff --git a/test/box/args.result b/test/box/args.result
index c9365f94891fb3dc29d152a16b99365766e3712e..a05ebb7ed2a9e7a3b111059ba61a9801ce87f816 100644
--- a/test/box/args.result
+++ b/test/box/args.result
@@ -1,7 +1,7 @@
-tarantool_box --help
+tarantool --help
 Tarantool - a Lua application server
 
-Usage: tarantool_box script.lua [OPTIONS]
+Usage: tarantool script.lua [OPTIONS]
 
 All command line options are passed to the interpreted script.
 When no script name is provided, the server responds to:
@@ -11,10 +11,10 @@ When no script name is provided, the server responds to:
 Please visit project home page at http://tarantool.org
 to see online documentation, submit bugs or contribute a patch.
 
-tarantool_box -h
+tarantool -h
 Tarantool - a Lua application server
 
-Usage: tarantool_box script.lua [OPTIONS]
+Usage: tarantool script.lua [OPTIONS]
 
 All command line options are passed to the interpreted script.
 When no script name is provided, the server responds to:
@@ -24,16 +24,16 @@ When no script name is provided, the server responds to:
 Please visit project home page at http://tarantool.org
 to see online documentation, submit bugs or contribute a patch.
 
-tarantool_box -Z
-tarantool_box: -Z: unknown option
+tarantool -Z
+tarantool: -Z: unknown option
 
-tarantool_box --no-such-option
-tarantool_box: --no-such-option: unknown option
+tarantool --no-such-option
+tarantool: --no-such-option: unknown option
 
-tarantool_box --version --no-such-option
-tarantool_box: --no-such-option: unknown option
+tarantool --version --no-such-option
+tarantool: --no-such-option: unknown option
 
-tarantool_box --version
+tarantool --version
 Tarantool 1.minor.patch-<rev>-<commit>
 Target: platform <build>
 Build options: flags
@@ -41,7 +41,7 @@ Compiler: cc
 C_FLAGS: flags
 CXX_FLAGS: flags
 
-tarantool_box -V
+tarantool -V
 Tarantool 1.minor.patch-<rev>-<commit>
 Target: platform <build>
 Build options: flags
diff --git a/test/box/box.lua b/test/box/box.lua
index 710e3bf2ffd3c0587982b548c5eb65407ee0b4cd..911fe7022fc1522a4f2789e28516a7b320818865 100644
--- a/test/box/box.lua
+++ b/test/box/box.lua
@@ -1,4 +1,4 @@
-#!/usr/bin/env tarantool_box
+#!/usr/bin/env tarantool
 os = require('os')
 
 box.cfg{
diff --git a/test/box/lua/require_init.lua b/test/box/lua/require_init.lua
index e7152bef72d00ee83d018703a0387d493cf38ff9..c9ab07dce70a9d087d1b5d849e5ab33571b0ff0a 100644
--- a/test/box/lua/require_init.lua
+++ b/test/box/lua/require_init.lua
@@ -1,4 +1,4 @@
-#!/usr/bin/env tarantool_box
+#!/usr/bin/env tarantool
 box.load_cfg()
 mod = require("require_mod")
 package_path = package.path
diff --git a/test/box/lua/test_init.lua b/test/box/lua/test_init.lua
index 02900967a053427ede559fe2a518c234ebca081d..88cc3acdcbd04d7c36904c6f09a78437d6b101be 100644
--- a/test/box/lua/test_init.lua
+++ b/test/box/lua/test_init.lua
@@ -1,4 +1,4 @@
-#!/usr/bin/env tarantool_box
+#!/usr/bin/env tarantool
 box.load_cfg()
 -- testing start-up script
 floor = require("math").floor
diff --git a/test/lib/tarantool_server.py b/test/lib/tarantool_server.py
index 6d03fe0e9199f88608ff0ce8cdf28f18d33def1c..aa71a80ba9fd93a9d16078ec012293185d7ac6a6 100644
--- a/test/lib/tarantool_server.py
+++ b/test/lib/tarantool_server.py
@@ -208,9 +208,9 @@ class GdbMixin(Mixin):
 
 class TarantoolServer(Server):
     default_tarantool = {
-            "bin":       "tarantool_box",
+            "bin":       "tarantool",
             "logfile":   "tarantool.log",
-            "pidfile":         "box.pid",
+            "pidfile":         "tarantool.pid",
             "name":            "default"}
 #----------------------------------PROPERTIES----------------------------------#
     @property
@@ -377,7 +377,7 @@ class TarantoolServer(Server):
     @classmethod
     def find_exe(cls, builddir, silent=True):
         cls.builddir = os.path.abspath(builddir)
-        builddir = os.path.join(builddir, "src/box")
+        builddir = os.path.join(builddir, "src")
         path = builddir + os.pathsep + os.environ["PATH"]
         if not silent:
             color_stdout("Looking for server binary in ", schema='serv_text')
diff --git a/test/module/box.lua b/test/module/box.lua
index 490c35fb63a850efdcb86a8a644b3063534cc3a1..cf371180709c764c55c4c78846a1f01c5699f434 100644
--- a/test/module/box.lua
+++ b/test/module/box.lua
@@ -1,4 +1,4 @@
-#!/usr/bin/env tarantool_box
+#!/usr/bin/env tarantool
 box.cfg{
     primary_port        = os.getenv("PRIMARY_PORT"),
     admin_port          = os.getenv("ADMIN_PORT"),
diff --git a/test/replication/hot_standby.lua b/test/replication/hot_standby.lua
index 5644a48ef46c2174265a51c483b99aee735c0e33..39548ea6e157307dfc91a381236a44232096fd03 100644
--- a/test/replication/hot_standby.lua
+++ b/test/replication/hot_standby.lua
@@ -1,4 +1,4 @@
-#!/usr/bin/env tarantool_box
+#!/usr/bin/env tarantool
 os = require('os')
 box.cfg({
     primary_port        = os.getenv("MASTER_PORT"),
diff --git a/test/replication/master.lua b/test/replication/master.lua
index 9ad0b5ebdd8ca0469786d6ad816005507effdf79..f9734faa4da64dc217a927960d8b5eef7cbf5197 100644
--- a/test/replication/master.lua
+++ b/test/replication/master.lua
@@ -1,4 +1,4 @@
-#!/usr/bin/env tarantool_box
+#!/usr/bin/env tarantool
 os = require('os')
 box.cfg({
     primary_port        = os.getenv("PRIMARY_PORT"),
diff --git a/test/replication/replica.lua b/test/replication/replica.lua
index 6815caec4637f2b0d070d93eb3f0bb8dbd1e08c1..ec3e2182f0dd27f4a2a5d37a6b032498d88a0ff8 100644
--- a/test/replication/replica.lua
+++ b/test/replication/replica.lua
@@ -1,4 +1,4 @@
-#!/usr/bin/env tarantool_box
+#!/usr/bin/env tarantool
 box.cfg({
     primary_port        = os.getenv("PRIMARY_PORT"),
     admin_port          = os.getenv("ADMIN_PORT"),
diff --git a/test/wal/wal.lua b/test/wal/wal.lua
index 14ba9c3b91cd23b7fb07590125dcaf572d6fcf55..78ba7b29ff33f3b9d87626079aa2f736f34e7d90 100644
--- a/test/wal/wal.lua
+++ b/test/wal/wal.lua
@@ -1,4 +1,4 @@
-#!/usr/bin/env tarantool_box
+#!/usr/bin/env tarantool
 box.cfg{
     primary_port        = os.getenv("PRIMARY_PORT"),
     admin_port          = os.getenv("ADMIN_PORT"),