diff --git a/docs/upgrade-guides/0.2.0.md b/docs/upgrade-guides/0.2.0.md
index 19ec049..116ddd9 100644
--- a/docs/upgrade-guides/0.2.0.md
+++ b/docs/upgrade-guides/0.2.0.md
@@ -83,7 +83,7 @@ new Connection(PATH).listTransactions(assetId, operation)
 
 ```js
 // new
-new Connection(PATH).searchAsset(search)
+new Connection(PATH).searchAssets(search)
 ```
 
 A querying interface to text-search all assets in BigchainDB. For more
diff --git a/src/transaction/makeTransferTransaction.js b/src/transaction/makeTransferTransaction.js
index 6e9207f..8272b2c 100644
--- a/src/transaction/makeTransferTransaction.js
+++ b/src/transaction/makeTransferTransaction.js
@@ -33,7 +33,7 @@ export default function makeTransferTransaction(
     const inputs = outputIndices.map((outputIndex) => {
         const fulfilledOutput = unspentTransaction.outputs[outputIndex]
         const transactionLink = {
-            'output': outputIndex,
+            'output_index': outputIndex,
             'transaction_id': unspentTransaction.id,
         }
 
diff --git a/test/transaction/test_transaction.js b/test/transaction/test_transaction.js
index 407bb55..d5a28ed 100644
--- a/test/transaction/test_transaction.js
+++ b/test/transaction/test_transaction.js
@@ -85,7 +85,7 @@ test('Create TRANSFER transaction based on CREATE transaction', t => {
         [aliceOutput],
         [makeInputTemplate(
             [alice.publicKey],
-            { output: 0, transaction_id: createTx.id }
+            { output_index: 0, transaction_id: createTx.id }
         )]
     ]
 
@@ -113,7 +113,7 @@ test('Create TRANSFER transaction based on TRANSFER transaction', t => {
         [aliceOutput],
         [makeInputTemplate(
             [alice.publicKey],
-            { output: 0, transaction_id: transferTx.id }
+            { output_index: 0, transaction_id: transferTx.id }
         )]
     ]