diff --git a/src/box/engine.cc b/src/box/engine.cc
index 6d33829c74e5c5849cfc9972915bfdd06090a565..3c28f1fa7712b4fd2b892a9883a2ee443066353a 100644
--- a/src/box/engine.cc
+++ b/src/box/engine.cc
@@ -108,7 +108,7 @@ engine_begin_join()
 	/* recover engine snapshot */
 	Engine *engine;
 	engine_foreach(engine) {
-		engine->begin_join();
+		engine->beginJoin();
 	}
 }
 
diff --git a/src/box/engine.h b/src/box/engine.h
index bde48b53d2ac8e19c8e5e93254d2d686e78ca527..e82abc2cd52641c4209a4c85c08d051ed1fb4ca1 100644
--- a/src/box/engine.h
+++ b/src/box/engine.h
@@ -139,7 +139,7 @@ class Engine: public Object {
 	/**
 	 * Notify engine about a JOIN start (slave-side)
 	 */
-	virtual void begin_join() = 0;
+	virtual void beginJoin() = 0;
 	/**
 	 * Begin a two-phase snapshot creation in this
 	 * engine (snapshot is a memtx idea of a checkpoint).
diff --git a/src/box/memtx_engine.cc b/src/box/memtx_engine.cc
index a813260dd7c29f33a0a218f04ce199ace8167f7a..7c13a9ef58e118cc2959031cd29710de26cf002f 100644
--- a/src/box/memtx_engine.cc
+++ b/src/box/memtx_engine.cc
@@ -240,7 +240,7 @@ MemtxEngine::rollback(struct txn *txn)
 }
 
 void
-MemtxEngine::begin_join()
+MemtxEngine::beginJoin()
 {
 }
 
diff --git a/src/box/memtx_engine.h b/src/box/memtx_engine.h
index 9d4cd042318b3f54f7c04c0e1ea8f25f8cfef6da..5aa2c2da94c5861c19c21c1c4daa46b6cea6ec3a 100644
--- a/src/box/memtx_engine.h
+++ b/src/box/memtx_engine.h
@@ -37,7 +37,7 @@ struct MemtxEngine: public Engine {
 	virtual void dropIndex(Index *index);
 	virtual void keydefCheck(struct space *space, struct key_def *key_def);
 	virtual void rollback(struct txn*);
-	virtual void begin_join();
+	virtual void beginJoin();
 	virtual void begin_recover_snapshot(int64_t lsn);
 	virtual void end_recover_snapshot();
 	virtual void end_recovery();
diff --git a/src/box/memtx_tree.cc b/src/box/memtx_tree.cc
index 95734edece98c4290b99954d7fc4a16a9874117e..528c156e0829462736dc0519e4c8caba116498e3 100644
--- a/src/box/memtx_tree.cc
+++ b/src/box/memtx_tree.cc
@@ -26,8 +26,6 @@
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-#include "evio.h"
-#include "replication.h"
 #include "memtx_tree.h"
 #include "tuple.h"
 #include "space.h"
diff --git a/src/box/sophia_engine.cc b/src/box/sophia_engine.cc
index 96ded2c91180d4f02eb70b69dc37a975d740c307..2d56e7c152246b2cf4ede600aae9388678f9e961 100644
--- a/src/box/sophia_engine.cc
+++ b/src/box/sophia_engine.cc
@@ -178,6 +178,10 @@ sophia_send_row(Relay *relay, uint32_t space_id, char *tuple,
 	relay_send(relay, &row);
 }
 
+/**
+ * Relay all data that should be present in the snapshot
+ * to the replica.
+ */
 void
 SophiaEngine::join(Relay *relay)
 {
@@ -388,7 +392,7 @@ SophiaEngine::rollback(struct txn *txn)
 }
 
 void
-SophiaEngine::begin_join()
+SophiaEngine::beginJoin()
 {
 	/* put engine to recovery-complete state to
 	 * correctly support join */
diff --git a/src/box/sophia_engine.h b/src/box/sophia_engine.h
index b5ae7ea76cfc7cb1cc62d0e5f4dfab2ee6e9d2e5..f48abf228a1b03fa3a778af20ead6c53636fab6f 100644
--- a/src/box/sophia_engine.h
+++ b/src/box/sophia_engine.h
@@ -40,7 +40,7 @@ struct SophiaEngine: public Engine {
 	virtual void begin(struct txn*, struct space*);
 	virtual void commit(struct txn*);
 	virtual void rollback(struct txn*);
-	virtual void begin_join();
+	virtual void beginJoin();
 	virtual void begin_recover_snapshot(int64_t);
 	virtual void end_recover_snapshot();
 	virtual void end_recovery();