diff --git a/libraries/chain/block.cpp b/libraries/chain/block.cpp
index 9d56df74986..27a4e352087 100644
--- a/libraries/chain/block.cpp
+++ b/libraries/chain/block.cpp
@@ -102,7 +102,7 @@ namespace eos { namespace chain {
       */
 
       for( const auto& trx : user_input )
-         ids.push_back( transaction_helpers::digest(trx) );
+         ids.push_back( transaction_digest(trx) );
 
       /**
        *  When generating the merkle hash of an output transaction we hash it
diff --git a/libraries/chain/chain_controller.cpp b/libraries/chain/chain_controller.cpp
index 190106e2ab2..3de4380630a 100644
--- a/libraries/chain/chain_controller.cpp
+++ b/libraries/chain/chain_controller.cpp
@@ -801,7 +801,7 @@ void chain_controller::validate_tapos(const Transaction& trx)const {
    const auto& tapos_block_summary = _db.get<block_summary_object>((uint16_t)trx.refBlockNum);
 
    //Verify TaPoS block summary has correct ID prefix, and that this block's time is not past the expiration
-   EOS_ASSERT(transaction_helpers::verify_reference_block(trx, tapos_block_summary.block_id), transaction_exception,
+   EOS_ASSERT(transaction_verify_reference_block(trx, tapos_block_summary.block_id), transaction_exception,
               "Transaction's reference block did not match. Is this transaction from a different fork?",
               ("tapos_summary", tapos_block_summary));
 }
diff --git a/libraries/chain/include/eos/chain/transaction.hpp b/libraries/chain/include/eos/chain/transaction.hpp
index d16b0a7e687..7d851614a25 100644
--- a/libraries/chain/include/eos/chain/transaction.hpp
+++ b/libraries/chain/include/eos/chain/transaction.hpp
@@ -59,43 +59,41 @@ namespace eos { namespace chain {
    
 
    /**
-    * @brief A base transaction without any explicit or implied authorizations.  
+    * @brief methods that operate on @ref eos::types::Transaction.  
     *
-    * This is a utility class for sharing common operations between inheriting types which defines
-    * additional features and requirements.
+    * These are utility methods for sharing common operations between inheriting types which define
+    * additional features and requirements based off of @ref eos::types::Transaction.
     */
-   namespace transaction_helpers {
-      /// Calculate the digest for a transaction
-      digest_type digest(const Transaction& t);
+   /// Calculate the digest for a transaction
+   digest_type transaction_digest(const Transaction& t);
 
-      void set_reference_block(Transaction& t, const block_id_type& reference_block);
+   void transaction_set_reference_block(Transaction& t, const block_id_type& reference_block);
 
-      bool verify_reference_block(const Transaction& t, const block_id_type& reference_block);
+   bool transaction_verify_reference_block(const Transaction& t, const block_id_type& reference_block);
 
-      template <typename T>
-      void set_message(Transaction& t, int index, const types::FuncName& type, T&& value) {
-         Message m(t.messages[index]);
-         m.set(type, std::forward<T>(value));
-         t.messages[index] = m;
-      }
+   template <typename T>
+   void transaction_set_message(Transaction& t, int index, const types::FuncName& type, T&& value) {
+      Message m(t.messages[index]);
+      m.set(type, std::forward<T>(value));
+      t.messages[index] = m;
+   }
 
-      template <typename T>
-      T message_as(Transaction& t, int index) {
-         Message m(t.messages[index]);
-         return m.as<T>();
-      }
+   template <typename T>
+   T transaction_message_as(Transaction& t, int index) {
+      Message m(t.messages[index]);
+      return m.as<T>();
+   }
 
-      template <typename... Args>
-      void emplace_message(Transaction& t, Args&&... a) {
-         t.messages.emplace_back(Message(std::forward<Args>(a)...));
-      }
+   template <typename... Args>
+   void transaction_emplace_message(Transaction& t, Args&&... a) {
+      t.messages.emplace_back(Message(std::forward<Args>(a)...));
+   }
 
-      /**
-       * clear all common data
-       */
-      inline void clear(Transaction& t) {
-         t.messages.clear();
-      }
+   /**
+      * clear all common data
+      */
+   inline void transaction_clear(Transaction& t) {
+      t.messages.clear();
    }
 
    /**
@@ -146,7 +144,7 @@ namespace eos { namespace chain {
       /**
        * Removes all messages, signatures, and authorizations
        */
-      void clear() { transaction_helpers::clear(*this); signatures.clear(); }
+      void clear() { transaction_clear(*this); signatures.clear(); }
 
       digest_type merkle_digest() const;
 
diff --git a/libraries/chain/transaction.cpp b/libraries/chain/transaction.cpp
index aa78c8b1182..12790f78210 100644
--- a/libraries/chain/transaction.cpp
+++ b/libraries/chain/transaction.cpp
@@ -31,26 +31,22 @@
 
 namespace eos { namespace chain {
 
-namespace transaction_helpers {
-
-digest_type digest(const Transaction& t) {
+digest_type transaction_digest(const Transaction& t) {
    digest_type::encoder enc;
    fc::raw::pack( enc, t );
    return enc.result();
 }
 
-void set_reference_block(Transaction& t, const block_id_type& reference_block) {
+void transaction_set_reference_block(Transaction& t, const block_id_type& reference_block) {
    t.refBlockNum = fc::endian_reverse_u32(reference_block._hash[0]);
    t.refBlockPrefix = reference_block._hash[1];
 }
 
-bool verify_reference_block(const Transaction& t, const block_id_type& reference_block) {
+bool transaction_verify_reference_block(const Transaction& t, const block_id_type& reference_block) {
    return t.refBlockNum == (decltype(t.refBlockNum))fc::endian_reverse_u32(reference_block._hash[0]) &&
           t.refBlockPrefix == (decltype(t.refBlockPrefix))reference_block._hash[1];
 }
 
-} // namespace transaction_helpers
-
 digest_type SignedTransaction::sig_digest( const chain_id_type& chain_id )const {
    digest_type::encoder enc;
    fc::raw::pack( enc, chain_id );
@@ -59,7 +55,7 @@ digest_type SignedTransaction::sig_digest( const chain_id_type& chain_id )const
 }
 
 eos::chain::transaction_id_type SignedTransaction::id() const {
-   auto h = transaction_helpers::digest(*this);
+   auto h = transaction_digest(*this);
    transaction_id_type result;
    memcpy(result._hash, h._hash, std::min(sizeof(result), sizeof(h)));
    return result;
diff --git a/programs/eosc/main.cpp b/programs/eosc/main.cpp
index 252a9450995..8a0dbf4ec9c 100644
--- a/programs/eosc/main.cpp
+++ b/programs/eosc/main.cpp
@@ -102,7 +102,7 @@ eos::chain_apis::read_only::get_info_results get_info() {
 fc::variant push_transaction( SignedTransaction& trx ) {
     auto info = get_info();
     trx.expiration = info.head_block_time + 100; //chain.head_block_time() + 100;
-    transaction_helpers::set_reference_block(trx, info.head_block_id);
+    transaction_set_reference_block(trx, info.head_block_id);
     boost::sort( trx.scope );
 
     return call( push_txn_func, trx );
@@ -127,7 +127,7 @@ void create_account( const vector<string>& cmd_line ) {
 
       SignedTransaction trx;
       trx.scope = sort_names({creator,eosaccnt});
-      transaction_helpers::emplace_message(trx, config::EosContractName, vector<types::AccountPermission>{{creator,"active"}}, "newaccount",
+      transaction_emplace_message(trx, config::EosContractName, vector<types::AccountPermission>{{creator,"active"}}, "newaccount",
                          types::newaccount{creator, newaccount, owner_auth,
                                            active_auth, recovery_auth, deposit});
 
@@ -308,7 +308,7 @@ int send_command (const vector<string> &cmd_line)
 
     SignedTransaction trx;
     trx.scope = { config::EosContractName, account };
-    transaction_helpers::emplace_message(trx,  config::EosContractName, vector<types::AccountPermission>{{account,"active"}},
+    transaction_emplace_message(trx,  config::EosContractName, vector<types::AccountPermission>{{account,"active"}},
                         "setcode", handler );
 
     std::cout << fc::json::to_pretty_string( push_transaction(trx)  ) << std::endl;
@@ -322,11 +322,11 @@ int send_command (const vector<string> &cmd_line)
 
     SignedTransaction trx;
     trx.scope = sort_names({sender,recipient});
-    transaction_helpers::emplace_message(trx, config::EosContractName, vector<types::AccountPermission>{{sender,"active"}}, "transfer",
+    transaction_emplace_message(trx, config::EosContractName, vector<types::AccountPermission>{{sender,"active"}}, "transfer",
                        types::transfer{sender, recipient, amount});
     auto info = get_info();
     trx.expiration = info.head_block_time + 100; //chain.head_block_time() + 100;
-    transaction_helpers::set_reference_block(trx, info.head_block_id);
+    transaction_set_reference_block(trx, info.head_block_id);
 
     std::cout << fc::json::to_pretty_string( call( push_txn_func, trx )) << std::endl;
   }
diff --git a/tests/api_tests/api_tests.cpp b/tests/api_tests/api_tests.cpp
index 2a552c5833f..172179f5b43 100644
--- a/tests/api_tests/api_tests.cpp
+++ b/tests/api_tests/api_tests.cpp
@@ -86,10 +86,10 @@ uint32_t CallFunction( testing_blockchain& chain, const types::Message& msg, con
    std::copy(data.begin(), data.end(), std::back_inserter(dest));
 
    //std::cout << "MANDO: " << msg.code << " " << msg.type << std::endl;
-   transaction_helpers::emplace_message(trx, msg);
+   transaction_emplace_message(trx, msg);
    
    trx.expiration = chain.head_block_time() + expiration++;
-   transaction_helpers::set_reference_block(trx, chain.head_block_id());
+   transaction_set_reference_block(trx, chain.head_block_id());
    //idump((trx));
    chain.push_transaction(trx);
 
@@ -177,9 +177,9 @@ void send_set_code_message(testing_blockchain& chain, types::setcode& handler, A
    trx.messages.resize(1);
    trx.messages[0].authorization = {{account,"active"}};
    trx.messages[0].code = config::EosContractName;
-   transaction_helpers::set_message(trx, 0, "setcode", handler);
+   transaction_set_message(trx, 0, "setcode", handler);
    trx.expiration = chain.head_block_time() + 100;
-   transaction_helpers::set_reference_block(trx, chain.head_block_id());
+   transaction_set_reference_block(trx, chain.head_block_id());
    chain.push_transaction(trx);
    chain.produce_blocks(1);
 }
diff --git a/tests/common/macro_support.hpp b/tests/common/macro_support.hpp
index bb468956a9f..39488e7b1ba 100644
--- a/tests/common/macro_support.hpp
+++ b/tests/common/macro_support.hpp
@@ -46,11 +46,11 @@ inline std::vector<Name> sort_names( std::vector<Name>&& names ) {
    { \
       eos::chain::SignedTransaction trx; \
       trx.scope = sort_names({ #creator, config::EosContractName }); \
-      transaction_helpers::emplace_message(trx, config::EosContractName, \
+      transaction_emplace_message(trx, config::EosContractName, \
                          vector<types::AccountPermission>{{#creator, "active"}}, \
                          "newaccount", types::newaccount{#creator, #name, owner, active, recovery, deposit}); \
       trx.expiration = chain.head_block_time() + 100; \
-      transaction_helpers::set_reference_block(trx, chain.head_block_id()); \
+      transaction_set_reference_block(trx, chain.head_block_id()); \
       chain.push_transaction(trx); \
       BOOST_TEST_CHECKPOINT("Created account " << #name); \
    }
@@ -78,11 +78,11 @@ inline std::vector<Name> sort_names( std::vector<Name>&& names ) {
    { \
       eos::chain::SignedTransaction trx; \
       trx.scope = {#account}; \
-      transaction_helpers::emplace_message(trx, config::EosContractName, \
+      transaction_emplace_message(trx, config::EosContractName, \
                          vector<types::AccountPermission>{{#account,"active"}}, \
                          "updateauth", types::updateauth{#account, authname, parentname, auth}); \
       trx.expiration = chain.head_block_time() + 100; \
-      transaction_helpers::set_reference_block(trx, chain.head_block_id()); \
+      transaction_set_reference_block(trx, chain.head_block_id()); \
       chain.push_transaction(trx); \
       BOOST_TEST_CHECKPOINT("Set " << #account << "'s " << authname << " authority."); \
    }
@@ -91,11 +91,11 @@ inline std::vector<Name> sort_names( std::vector<Name>&& names ) {
    { \
       eos::chain::SignedTransaction trx; \
       trx.scope = {#account}; \
-      transaction_helpers::emplace_message(trx, config::EosContractName, \
+      transaction_emplace_message(trx, config::EosContractName, \
                          vector<types::AccountPermission>{{#account,"active"}}, \
                          "deleteauth", types::deleteauth{#account, authname}); \
       trx.expiration = chain.head_block_time() + 100; \
-      transaction_helpers::set_reference_block(trx, chain.head_block_id()); \
+      transaction_set_reference_block(trx, chain.head_block_id()); \
       chain.push_transaction(trx); \
       BOOST_TEST_CHECKPOINT("Deleted " << #account << "'s " << authname << " authority."); \
    }
@@ -104,11 +104,11 @@ inline std::vector<Name> sort_names( std::vector<Name>&& names ) {
    { \
       eos::chain::SignedTransaction trx; \
       trx.scope = {#account}; \
-      transaction_helpers::emplace_message(trx, config::EosContractName, \
+      transaction_emplace_message(trx, config::EosContractName, \
                          vector<types::AccountPermission>{{#account,"active"}}, \
                          "linkauth", types::linkauth{#account, #codeacct, messagetype, authname}); \
       trx.expiration = chain.head_block_time() + 100; \
-      transaction_helpers::set_reference_block(trx, chain.head_block_id()); \
+      transaction_set_reference_block(trx, chain.head_block_id()); \
       chain.push_transaction(trx); \
       BOOST_TEST_CHECKPOINT("Link " << #codeacct << "::" << messagetype << " to " << #account \
                             << "'s " << authname << " authority."); \
@@ -119,11 +119,11 @@ inline std::vector<Name> sort_names( std::vector<Name>&& names ) {
    { \
       eos::chain::SignedTransaction trx; \
       trx.scope = {#account}; \
-      transaction_helpers::emplace_message(trx, config::EosContractName, \
+      transaction_emplace_message(trx, config::EosContractName, \
                          vector<types::AccountPermission>{{#account,"active"}}, \
                          "unlinkauth", types::unlinkauth{#account, #codeacct, messagetype}); \
       trx.expiration = chain.head_block_time() + 100; \
-      transaction_helpers::set_reference_block(trx, chain.head_block_id()); \
+      transaction_set_reference_block(trx, chain.head_block_id()); \
       chain.push_transaction(trx); \
       BOOST_TEST_CHECKPOINT("Unlink " << #codeacct << "::" << messagetype << " from " << #account); \
    }
@@ -133,11 +133,11 @@ inline std::vector<Name> sort_names( std::vector<Name>&& names ) {
    { \
       eos::chain::SignedTransaction trx; \
       trx.scope = sort_names({#sender,#recipient}); \
-      transaction_helpers::emplace_message(trx, config::EosContractName, \
+      transaction_emplace_message(trx, config::EosContractName, \
                          vector<types::AccountPermission>{ {#sender,"active"} }, \
                          "transfer", types::transfer{#sender, #recipient, Amount.amount}); \
       trx.expiration = chain.head_block_time() + 100; \
-      transaction_helpers::set_reference_block(trx, chain.head_block_id()); \
+      transaction_set_reference_block(trx, chain.head_block_id()); \
       chain.push_transaction(trx); \
       BOOST_TEST_CHECKPOINT("Transfered " << Amount << " from " << #sender << " to " << #recipient); \
    }
@@ -147,10 +147,10 @@ inline std::vector<Name> sort_names( std::vector<Name>&& names ) {
    { \
       eos::chain::SignedTransaction trx; \
       trx.scope = sort_names( { #sender, #recipient, config::EosContractName } ); \
-      transaction_helpers::emplace_message(trx, config::EosContractName, vector<types::AccountPermission>{{#sender, "active"}}, \
+      transaction_emplace_message(trx, config::EosContractName, vector<types::AccountPermission>{{#sender, "active"}}, \
                         "lock", types::lock{#sender, #recipient, amount}); \
       trx.expiration = chain.head_block_time() + 100; \
-      transaction_helpers::set_reference_block(trx, chain.head_block_id()); \
+      transaction_set_reference_block(trx, chain.head_block_id()); \
       chain.push_transaction(trx); \
       BOOST_TEST_CHECKPOINT("Staked " << amount << " to " << #recipient); \
    }
@@ -160,11 +160,11 @@ inline std::vector<Name> sort_names( std::vector<Name>&& names ) {
    { \
       eos::chain::SignedTransaction trx; \
       trx.scope = sort_names( { config::EosContractName } ); \
-      transaction_helpers::emplace_message(trx, config::EosContractName, \
+      transaction_emplace_message(trx, config::EosContractName, \
                          vector<types::AccountPermission>{{#account, "active"}}, \
                          "unlock", types::unlock{#account, amount}); \
       trx.expiration = chain.head_block_time() + 100; \
-      transaction_helpers::set_reference_block(trx, chain.head_block_id()); \
+      transaction_set_reference_block(trx, chain.head_block_id()); \
       chain.push_transaction(trx); \
       BOOST_TEST_CHECKPOINT("Begin unstake " << amount << " to " << #account); \
    }
@@ -173,10 +173,10 @@ inline std::vector<Name> sort_names( std::vector<Name>&& names ) {
    { \
       eos::chain::SignedTransaction trx; \
       trx.scope = sort_names( { config::EosContractName, #account } ); \
-      transaction_helpers::emplace_message(trx, config::EosContractName, vector<types::AccountPermission>{{#account, "active"}}, \
+      transaction_emplace_message(trx, config::EosContractName, vector<types::AccountPermission>{{#account, "active"}}, \
                          "claim", types::claim{#account, amount}); \
       trx.expiration = chain.head_block_time() + 100; \
-      transaction_helpers::set_reference_block(trx, chain.head_block_id()); \
+      transaction_set_reference_block(trx, chain.head_block_id()); \
       chain.push_transaction(trx); \
       BOOST_TEST_CHECKPOINT("Finish unstake " << amount << " to " << #account); \
    }
@@ -185,11 +185,11 @@ inline std::vector<Name> sort_names( std::vector<Name>&& names ) {
    { \
       eos::chain::SignedTransaction trx; \
       trx.scope = sort_names( {#owner, config::EosContractName} ); \
-      transaction_helpers::emplace_message(trx, config::EosContractName, \
+      transaction_emplace_message(trx, config::EosContractName, \
                          vector<types::AccountPermission>{{#owner, "active"}}, \
                          "setproducer", types::setproducer{#owner, key, cfg}); \
       trx.expiration = chain.head_block_time() + 100; \
-      transaction_helpers::set_reference_block(trx, chain.head_block_id()); \
+      transaction_set_reference_block(trx, chain.head_block_id()); \
       chain.push_transaction(trx); \
       BOOST_TEST_CHECKPOINT("Create producer " << #owner); \
    }
@@ -202,11 +202,11 @@ inline std::vector<Name> sort_names( std::vector<Name>&& names ) {
    { \
       eos::chain::SignedTransaction trx; \
       trx.scope = sort_names( {#voter, config::EosContractName} ); \
-      transaction_helpers::emplace_message(trx, config::EosContractName,  \
+      transaction_emplace_message(trx, config::EosContractName,  \
                          vector<types::AccountPermission>{{#voter, "active"}}, \
                          "okproducer", types::okproducer{#voter, #producer, approved? 1 : 0}); \
       trx.expiration = chain.head_block_time() + 100; \
-      transaction_helpers::set_reference_block(trx, chain.head_block_id()); \
+      transaction_set_reference_block(trx, chain.head_block_id()); \
       chain.push_transaction(trx); \
       BOOST_TEST_CHECKPOINT("Set producer approval from " << #voter << " for " << #producer << " to " << approved); \
    }
@@ -215,11 +215,11 @@ inline std::vector<Name> sort_names( std::vector<Name>&& names ) {
    { \
       eos::chain::SignedTransaction trx; \
       trx.scope = sort_names( {owner, config::EosContractName} ); \
-      transaction_helpers::emplace_message(trx, config::EosContractName,  \
+      transaction_emplace_message(trx, config::EosContractName,  \
                          vector<types::AccountPermission>{{owner, "active"}}, \
                          "setproducer", types::setproducer{owner, key, cfg}); \
       trx.expiration = chain.head_block_time() + 100; \
-      transaction_helpers::set_reference_block(trx, chain.head_block_id()); \
+      transaction_set_reference_block(trx, chain.head_block_id()); \
       chain.push_transaction(trx); \
       BOOST_TEST_CHECKPOINT("Update producer " << owner); \
    }
diff --git a/tests/common/testing_macros.hpp b/tests/common/testing_macros.hpp
index 969d8ba90e5..5a7c956ce94 100644
--- a/tests/common/testing_macros.hpp
+++ b/tests/common/testing_macros.hpp
@@ -284,13 +284,13 @@
 { \
    eos::chain::SignedTransaction trx; \
    if (std::string(#stakeholder) != std::string(#proxy)) \
-      transaction_helpers::emplace_message(trx, config::EosContractName, \
+      transaction_emplace_message(trx, config::EosContractName, \
                          vector<types::AccountPermission>{ {#stakeholder,"active"} }, "setproxy", types::setproxy{#stakeholder, #proxy}); \
    else \
-      transaction_helpers::emplace_message(trx, config::EosContractName, \
+      transaction_emplace_message(trx, config::EosContractName, \
                          vector<types::AccountPermission>{ {#stakeholder,"active"} }, "setproxy", types::setproxy{#stakeholder, #proxy}); \
    trx.expiration = chain.head_block_time() + 100; \
-   transaction_helpers::set_reference_block(trx, chain.head_block_id()); \
+   transaction_set_reference_block(trx, chain.head_block_id()); \
    chain.push_transaction(trx); \
 }
 
diff --git a/tests/slow_tests/slow_tests.cpp b/tests/slow_tests/slow_tests.cpp
index a41f472bcdf..0f6162d1620 100644
--- a/tests/slow_tests/slow_tests.cpp
+++ b/tests/slow_tests/slow_tests.cpp
@@ -298,9 +298,9 @@ void SetCode( testing_blockchain& chain, AccountName account, const char* wast )
          trx.messages.resize(1);
          trx.messages[0].code = config::EosContractName;
          trx.messages[0].authorization.emplace_back(types::AccountPermission{account,"active"});
-         transaction_helpers::set_message(trx, 0, "setcode", handler);
+         transaction_set_message(trx, 0, "setcode", handler);
          trx.expiration = chain.head_block_time() + 100;
-         transaction_helpers::set_reference_block(trx, chain.head_block_id());
+         transaction_set_reference_block(trx, chain.head_block_id());
          chain.push_transaction(trx);
          chain.produce_blocks(1);
       }
@@ -309,12 +309,12 @@ void SetCode( testing_blockchain& chain, AccountName account, const char* wast )
 void TransferCurrency( testing_blockchain& chain, AccountName from, AccountName to, uint64_t amount ) {
    eos::chain::SignedTransaction trx;
    trx.scope = sort_names({from,to});
-   transaction_helpers::emplace_message(trx, "currency", 
+   transaction_emplace_message(trx, "currency", 
                       vector<types::AccountPermission>{ {from,"active"} },
                       "transfer", types::transfer{from, to, amount});
 
    trx.expiration = chain.head_block_time() + 100;
-   transaction_helpers::set_reference_block(trx, chain.head_block_id());
+   transaction_set_reference_block(trx, chain.head_block_id());
    idump((trx));
    chain.push_transaction(trx);
 }
@@ -322,11 +322,11 @@ void TransferCurrency( testing_blockchain& chain, AccountName from, AccountName
 void WithdrawCurrency( testing_blockchain& chain, AccountName from, AccountName to, uint64_t amount ) {
    eos::chain::SignedTransaction trx;
    trx.scope = sort_names({from,to});
-   transaction_helpers::emplace_message(trx, "currency", 
+   transaction_emplace_message(trx, "currency", 
                       vector<types::AccountPermission>{ {from,"active"},{to,"active"} },
                       "transfer", types::transfer{from, to, amount});
    trx.expiration = chain.head_block_time() + 100;
-   transaction_helpers::set_reference_block(trx, chain.head_block_id());
+   transaction_set_reference_block(trx, chain.head_block_id());
    chain.push_transaction(trx);
 }
 
@@ -352,9 +352,9 @@ BOOST_FIXTURE_TEST_CASE(create_script, testing_fixture)
          trx.messages.resize(1);
          trx.messages[0].code = config::EosContractName;
          trx.messages[0].authorization.emplace_back(types::AccountPermission{"currency","active"});
-         transaction_helpers::set_message(trx, 0, "setcode", handler);
+         transaction_set_message(trx, 0, "setcode", handler);
          trx.expiration = chain.head_block_time() + 100;
-         transaction_helpers::set_reference_block(trx, chain.head_block_id());
+         transaction_set_reference_block(trx, chain.head_block_id());
          chain.push_transaction(trx);
          chain.produce_blocks(1);
       }
@@ -365,11 +365,11 @@ BOOST_FIXTURE_TEST_CASE(create_script, testing_fixture)
       {
          eos::chain::SignedTransaction trx;
          trx.scope = sort_names({"currency","inita"});
-         transaction_helpers::emplace_message(trx, "currency", 
+         transaction_emplace_message(trx, "currency", 
                             vector<types::AccountPermission>{ {"currency","active"} },
                             "transfer", types::transfer{"currency", "inita", 1+i});
          trx.expiration = chain.head_block_time() + 100;
-         transaction_helpers::set_reference_block(trx, chain.head_block_id());
+         transaction_set_reference_block(trx, chain.head_block_id());
          //idump((trx));
          chain.push_transaction(trx);
       }
@@ -403,12 +403,12 @@ void SellCurrency( testing_blockchain& chain, AccountName seller, AccountName ex
 
    eos::chain::SignedTransaction trx;
    trx.scope = sort_names({"exchange"});
-   transaction_helpers::emplace_message(trx, "exchange", 
+   transaction_emplace_message(trx, "exchange", 
                       vector<types::AccountPermission>{ {seller,"active"} },
                       "sell", b );
    //trx.messages.back().set_packed( "sell", b);
    trx.expiration = chain.head_block_time() + 100;
-   transaction_helpers::set_reference_block(trx, chain.head_block_id());
+   transaction_set_reference_block(trx, chain.head_block_id());
    chain.push_transaction(trx);
 
 }
@@ -421,12 +421,12 @@ void BuyCurrency( testing_blockchain& chain, AccountName buyer, AccountName exch
 
    eos::chain::SignedTransaction trx;
    trx.scope = sort_names({"exchange"});
-   transaction_helpers::emplace_message(trx, "exchange", 
+   transaction_emplace_message(trx, "exchange", 
                       vector<types::AccountPermission>{ {buyer,"active"} },
                       "buy", b );
    //trx.messages.back().set_packed( "buy", b);
    trx.expiration = chain.head_block_time() + 100;
-   transaction_helpers::set_reference_block(trx, chain.head_block_id());
+   transaction_set_reference_block(trx, chain.head_block_id());
    chain.push_transaction(trx);
 }
 
@@ -1117,9 +1117,9 @@ R"(
       trx.messages.resize(1);
       trx.messages[0].code = config::EosContractName;
       trx.messages[0].authorization.emplace_back(types::AccountPermission{"simplecoin","active"});
-      transaction_helpers::set_message(trx, 0, "setcode", handler);
+      transaction_set_message(trx, 0, "setcode", handler);
       trx.expiration = chain.head_block_time() + 100;
-      transaction_helpers::set_reference_block(trx, chain.head_block_id());
+      transaction_set_reference_block(trx, chain.head_block_id());
       try {
          chain.push_transaction(trx);
          BOOST_FAIL("floating point instructions should be rejected");
@@ -1154,9 +1154,9 @@ BOOST_FIXTURE_TEST_CASE(create_script_w_loop, testing_fixture)
          trx.messages.resize(1);
          trx.messages[0].code = config::EosContractName;
          trx.messages[0].authorization.emplace_back(types::AccountPermission{"currency","active"});
-         transaction_helpers::set_message(trx, 0, "setcode", handler);
+         transaction_set_message(trx, 0, "setcode", handler);
          trx.expiration = chain.head_block_time() + 100;
-         transaction_helpers::set_reference_block(trx, chain.head_block_id());
+         transaction_set_reference_block(trx, chain.head_block_id());
          chain.push_transaction(trx);
          chain.produce_blocks(1);
       }
@@ -1165,11 +1165,11 @@ BOOST_FIXTURE_TEST_CASE(create_script_w_loop, testing_fixture)
       {
          eos::chain::SignedTransaction trx;
          trx.scope = sort_names({"currency","inita"});
-         transaction_helpers::emplace_message(trx, "currency",
+         transaction_emplace_message(trx, "currency",
                             vector<types::AccountPermission>{ {"currency","active"} },
                             "transfer", types::transfer{"currency", "inita", 1});
          trx.expiration = chain.head_block_time() + 100;
-         transaction_helpers::set_reference_block(trx, chain.head_block_id());
+         transaction_set_reference_block(trx, chain.head_block_id());
          try
          {
             wlog("starting long transaction");
diff --git a/tests/tests/block_tests.cpp b/tests/tests/block_tests.cpp
index 597602060e0..18120642f54 100644
--- a/tests/tests/block_tests.cpp
+++ b/tests/tests/block_tests.cpp
@@ -146,11 +146,11 @@ BOOST_FIXTURE_TEST_CASE(trx_variant, testing_fixture) {
 
    eos::chain::ProcessedTransaction trx;
    trx.scope = sort_names({from,to});
-   transaction_helpers::emplace_message(trx, "eos", 
+   transaction_emplace_message(trx, "eos", 
                       vector<types::AccountPermission>{ {from,"active"} },
                       "transfer", types::transfer{from, to, amount/*, ""*/});
    trx.expiration = chain.head_block_time() + 100;
-   transaction_helpers::set_reference_block(trx, chain.head_block_id());
+   transaction_set_reference_block(trx, chain.head_block_id());
 
    auto original = fc::raw::pack( trx );
    auto var      = chain.transaction_to_variant( trx );
@@ -179,10 +179,10 @@ BOOST_FIXTURE_TEST_CASE(irrelevant_auth, testing_fixture) {
 
    ProcessedTransaction trx;
    trx.scope = sort_names({"joe", "inita"});
-   transaction_helpers::emplace_message(trx, config::EosContractName, vector<types::AccountPermission>{{"inita", "active"}},
+   transaction_emplace_message(trx, config::EosContractName, vector<types::AccountPermission>{{"inita", "active"}},
                       "transfer", types::transfer{"inita", "joe", 50});
    trx.expiration = chain.head_block_time() + 100;
-   transaction_helpers::set_reference_block(trx, chain.head_block_id());
+   transaction_set_reference_block(trx, chain.head_block_id());
    chain.push_transaction(trx, chain_controller::skip_transaction_signatures);
 
    chain.clear_pending();
diff --git a/tests/tests/native_contract_tests.cpp b/tests/tests/native_contract_tests.cpp
index bdca681cb7b..4c29b0fb278 100644
--- a/tests/tests/native_contract_tests.cpp
+++ b/tests/tests/native_contract_tests.cpp
@@ -92,7 +92,7 @@ BOOST_FIXTURE_TEST_CASE(transfer, testing_fixture)
       SignedTransaction trx;
       BOOST_REQUIRE_THROW(chain.push_transaction(trx), transaction_exception); // no messages
       trx.messages.resize(1);
-      transaction_helpers::set_reference_block(trx, chain.head_block_id());
+      transaction_set_reference_block(trx, chain.head_block_id());
       trx.expiration = chain.head_block_time() + 100;
       trx.scope = sort_names( {"inita", "initb"} );
 
@@ -105,7 +105,7 @@ BOOST_FIXTURE_TEST_CASE(transfer, testing_fixture)
       trx.messages[0].type = "transfer";
       trx.messages[0].authorization = {{"inita", "active"}};
       trx.messages[0].code = config::EosContractName;
-      transaction_helpers::set_message(trx, 0, "transfer", trans);
+      transaction_set_message(trx, 0, "transfer", trans);
       chain.push_transaction(trx, chain_controller::skip_transaction_signatures);
 
       BOOST_CHECK_EQUAL(chain.get_liquid_balance("inita"), Asset(100000 - 100));