diff --git a/lightning/src/ln/channelmanager.rs b/lightning/src/ln/channelmanager.rs
index df026971847..ac71e16e00c 100644
--- a/lightning/src/ln/channelmanager.rs
+++ b/lightning/src/ln/channelmanager.rs
@@ -49,7 +49,7 @@ use crate::ln::features::Bolt11InvoiceFeatures;
 use crate::routing::gossip::NetworkGraph;
 use crate::routing::router::{BlindedTail, DefaultRouter, InFlightHtlcs, Path, Payee, PaymentParameters, Route, RouteParameters, Router};
 use crate::routing::scoring::{ProbabilisticScorer, ProbabilisticScoringFeeParameters};
-use crate::ln::channelmanager_utils::{check_incoming_htlc_cltv, create_recv_pending_htlc_info, create_fwd_pending_htlc_info, decode_incoming_update_add_htlc_onion, InboundOnionErr, NextPacketDetails};
+use crate::ln::onion_payment::{check_incoming_htlc_cltv, create_recv_pending_htlc_info, create_fwd_pending_htlc_info, decode_incoming_update_add_htlc_onion, InboundOnionErr, NextPacketDetails};
 use crate::ln::msgs;
 use crate::ln::onion_utils;
 use crate::ln::onion_utils::HTLCFailReason;
@@ -130,7 +130,7 @@ pub enum PendingHTLCRouting {
 		/// Used to track when we should expire pending HTLCs that go unclaimed.
 		incoming_cltv_expiry: u32,
 		/// Shared secret derived using a phantom node secret key. If this field is Some, the
-		/// payment was sent to a phantom node (one hop behond the current node), but can be
+		/// payment was sent to a phantom node (one hop beyond the current node), but can be
 		/// settled by this node.
 		phantom_shared_secret: Option<[u8; 32]>,
 		/// See [`RecipientOnionFields::custom_tlvs`] for more info.
diff --git a/lightning/src/ln/mod.rs b/lightning/src/ln/mod.rs
index 1f7e4c56018..7b37b07cca8 100644
--- a/lightning/src/ln/mod.rs
+++ b/lightning/src/ln/mod.rs
@@ -13,7 +13,7 @@
 #[macro_use]
 pub mod functional_test_utils;
 
-pub mod channelmanager_utils;
+pub mod onion_payment;
 pub mod channelmanager;
 pub mod inbound_payment;
 pub mod msgs;
diff --git a/lightning/src/ln/channelmanager_utils.rs b/lightning/src/ln/onion_payment.rs
similarity index 100%
rename from lightning/src/ln/channelmanager_utils.rs
rename to lightning/src/ln/onion_payment.rs