diff --git a/src/components/operations/Operation.js b/src/components/operations/Operation.js
index 613aa472d..80eed7557 100644
--- a/src/components/operations/Operation.js
+++ b/src/components/operations/Operation.js
@@ -15,13 +15,10 @@ import CreateAccount from './CreateAccount'
 import Inflation from './Inflation'
 import ManageData from './ManageData'
 import Offer from './Offer'
-import PathPaymentStrictSend from './PathPaymentStrictSend'
-import PathPaymentStrictReceive from './PathPaymentStrictReceive'
+import PathPayment from './PathPayment'
 import Payment from './Payment'
 import SetOptions from './SetOptions'
 
-// TODO: can remove some of the below maps after renames in Horizon v0.25
-// see comments in code here: https://github.com/stellar/go/blob/d01f442ec0d3911bd73a0ad70cf593a3fea64dde/protocols/horizon/operations/main.go#L16
 const opTypeComponentMap = {
   account_merge: AccountMerge,
   allow_trust: AllowTrust,
@@ -30,7 +27,6 @@ const opTypeComponentMap = {
   create_account: CreateAccount,
 
   create_passive_sell_offer: Offer,
-  // NOTE: can be removed in future after rename:
   create_passive_offer: Offer, // < Protocol 11
 
   inflation: Inflation,
@@ -38,13 +34,11 @@ const opTypeComponentMap = {
 
   manage_buy_offer: Offer,
   manage_sell_offer: Offer,
-  // NOTE: can be removed in future after rename:
   manage_offer: Offer, // < Protocol 11
   
-  path_payment_strict_send: PathPaymentStrictSend,
-  path_payment_strict_receive: PathPaymentStrictReceive,
-  // NOTE: can be removed in future after rename:
-  path_payment: PathPaymentStrictReceive,
+  path_payment_strict_send: PathPayment,
+  path_payment_strict_receive: PathPayment,
+  path_payment: PathPayment,  // < Protocol 12
   
   payment: Payment,
   set_options: SetOptions,