diff --git a/libraries/chain/short_order_evaluator.cpp b/libraries/chain/call_order_evaluator.cpp
similarity index 100%
rename from libraries/chain/short_order_evaluator.cpp
rename to libraries/chain/call_order_evaluator.cpp
diff --git a/libraries/chain/include/graphene/chain/short_order_evaluator.hpp b/libraries/chain/include/graphene/chain/call_order_evaluator.hpp
similarity index 100%
rename from libraries/chain/include/graphene/chain/short_order_evaluator.hpp
rename to libraries/chain/include/graphene/chain/call_order_evaluator.hpp
diff --git a/libraries/chain/include/graphene/chain/short_order_object.hpp b/libraries/chain/include/graphene/chain/call_order_object.hpp
similarity index 98%
rename from libraries/chain/include/graphene/chain/short_order_object.hpp
rename to libraries/chain/include/graphene/chain/call_order_object.hpp
index 1036b743..5c1f8b67 100644
--- a/libraries/chain/include/graphene/chain/short_order_object.hpp
+++ b/libraries/chain/include/graphene/chain/call_order_object.hpp
@@ -120,7 +120,6 @@ namespace graphene { namespace chain {
    > force_settlement_object_multi_index_type;
 
 
-  typedef generic_index<short_order_object, short_order_multi_index_type>                    short_order_index;
   typedef generic_index<call_order_object, call_order_multi_index_type>                      call_order_index;
   typedef generic_index<force_settlement_object, force_settlement_object_multi_index_type>   force_settlement_index;
 } } // graphene::chain