diff --git a/bigchaindb/backend/mongodb/query.py b/bigchaindb/backend/mongodb/query.py
index eacbcea7..369cb39d 100644
--- a/bigchaindb/backend/mongodb/query.py
+++ b/bigchaindb/backend/mongodb/query.py
@@ -94,7 +94,7 @@ def get_votes_by_block_id(conn, block_id):
 
 
 @register_query(MongoDBConnection)
-def get_votes_block_id_and_voter(conn, block_id, node_pubkey):
+def get_votes_by_block_id_and_voter(conn, block_id, node_pubkey):
     return conn.db['votes']\
             .find({'vote.voting_for_block': block_id,
                    'node_pubkey': node_pubkey})
diff --git a/bigchaindb/backend/mongodb/schema.py b/bigchaindb/backend/mongodb/schema.py
index 7cfcc18d..1a5d2aec 100644
--- a/bigchaindb/backend/mongodb/schema.py
+++ b/bigchaindb/backend/mongodb/schema.py
@@ -26,7 +26,7 @@ def create_database(conn, dbname):
 
 
 @register_schema(MongoDBConnection)
-def create_table(conn, dbname):
+def create_tables(conn, dbname):
     for table_name in ['bigchain', 'backlog', 'votes']:
         logger.info('Create `%s` table.', table_name)
         # create the table
@@ -42,7 +42,7 @@ def create_indexes(conn, dbname):
 
 
 @register_schema(MongoDBConnection)
-def drop(conn, dbname):
+def drop_database(conn, dbname):
     conn.drop_database(dbname)