diff --git a/src/wallet/monero_wallet.h b/src/wallet/monero_wallet.h
index 40df6c0..8ecae28 100644
--- a/src/wallet/monero_wallet.h
+++ b/src/wallet/monero_wallet.h
@@ -655,15 +655,15 @@ namespace monero {
      * Get wallet transactions.  Wallet transactions contain one or more
      * transfers that are either incoming or outgoing to the wallet.
      *
-     * Query results can be filtered by passing in a transaction request.
-     * Transactions must meet every criteria defined in the request in order to
+     * Query results can be filtered by passing in a transaction query.
+     * Transactions must meet every criteria defined in the query in order to
      * be returned.  All filtering is optional and no filtering is applied when
      * not defined.
      *
-     * @param request filters query results (optional)
-     * @return wallet transactions per the request
+     * @param query filters query results (optional)
+     * @return wallet transactions per the query
      */
-    vector<shared_ptr<monero_tx_wallet>> get_txs(const monero_tx_query& request) const;
+    vector<shared_ptr<monero_tx_wallet>> get_txs(const monero_tx_query& query) const;
 
 //    /**
 //     * Get all incoming and outgoing transfers to and from this wallet.  An
@@ -713,14 +713,14 @@ namespace monero {
      * are stored on the blockchain.
      *
      * Query results can be filtered by passing in a monero_transfer_query.
-     * Transfers must meet every criteria defined in the request in order to be
+     * Transfers must meet every criteria defined in the query in order to be
      * returned.  All filtering is optional and no filtering is applied when not
      * defined.
      *
-     * @param request filters query results (optional)
-     * @return wallet transfers per the request
+     * @param query filters query results (optional)
+     * @return wallet transfers per the query
      */
-    vector<shared_ptr<monero_transfer>> get_transfers(const monero_transfer_query& request) const;
+    vector<shared_ptr<monero_transfer>> get_transfers(const monero_transfer_query& query) const;
 
 //    /**
 //     * Get outputs created from previous transactions that belong to the wallet
@@ -737,13 +737,13 @@ namespace monero {
      * transactions which are stored in blocks on the blockchain.
      *
      * Results can be configured by passing a monero_output_query.  Outputs must
-     * meet every criteria defined in the request in order to be returned.  All
+     * meet every criteria defined in the query in order to be returned.  All
      * filtering is optional and no filtering is applied when not defined.
      *
-     * @param request specifies request options (optional)
-     * @return List<monero_output_wallet> are wallet outputs per the request
+     * @param query specifies query options (optional)
+     * @return wallet outputs per the query
      */
-    vector<shared_ptr<monero_output_wallet>> get_outputs(const monero_output_query& request) const;
+    vector<shared_ptr<monero_output_wallet>> get_outputs(const monero_output_query& query) const;
 
     /**
      * Export all outputs in hex format.
diff --git a/todo.txt b/todo.txt
index 3e0a1a0..84c2816 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,10 +1,7 @@
 TODO
-monero_wallet.h request -> query
 preserve rpc error codes, just throwing runtime_error now
-gen_utils.h and monero_utils.h should not depend on monero_wallet.h
-add to ecosystem?
 monero_wallet.cpp move utilities in monero_namespace to be private
-polish model: no boost::optional<shared_ptr>? no boost::optional<string>? etc
+polish model: remove all boost::optional from model to be consistent with core?
 ensure model toPropertyTrees(), etc are not unecessarily copying return objects
 monero_wallet_listener should be a class?
 way to use copy constructors instead of query copy(sp, sp) methods?