diff --git a/funding/manager.go b/funding/manager.go
index 113a30343..edd56b712 100644
--- a/funding/manager.go
+++ b/funding/manager.go
@@ -2909,7 +2909,7 @@ func (f *Manager) sendFundingLocked(completeChan *channeldb.OpenChannel,
 	if err != nil {
 		return fmt.Errorf("unable to create next revocation: %v", err)
 	}
-	fundingLockedMsg := lnwire.NewFundingLocked(chanID, nextRevocation)
+	fundingLockedMsg := lnwire.NewChannelReady(chanID, nextRevocation)
 
 	// If the channel negotiated the option-scid-alias feature bit, we'll
 	// send a TLV segment that includes an alias the peer can use in their
@@ -3517,7 +3517,7 @@ func (f *Manager) handleFundingLocked(peer lnpeer.Peer,
 				return
 			}
 
-			fundingLockedMsg := lnwire.NewFundingLocked(
+			fundingLockedMsg := lnwire.NewChannelReady(
 				chanID, secondPoint,
 			)
 			fundingLockedMsg.AliasScid = &alias
diff --git a/htlcswitch/link.go b/htlcswitch/link.go
index b1836c7c7..2ef8d1f93 100644
--- a/htlcswitch/link.go
+++ b/htlcswitch/link.go
@@ -734,7 +734,7 @@ func (l *channelLink) syncChanStates() error {
 					"revocation: %v", err)
 			}
 
-			fundingLockedMsg := lnwire.NewFundingLocked(
+			fundingLockedMsg := lnwire.NewChannelReady(
 				l.ChanID(), nextRevocation,
 			)
 
diff --git a/lnwire/funding_locked.go b/lnwire/funding_locked.go
index e2625f48b..0995f91d3 100644
--- a/lnwire/funding_locked.go
+++ b/lnwire/funding_locked.go
@@ -35,7 +35,7 @@ type ChannelReady struct {
 
 // NewFundingLocked creates a new FundingLocked message, populating it with the
 // necessary IDs and revocation secret.
-func NewFundingLocked(cid ChannelID, npcp *btcec.PublicKey) *ChannelReady {
+func NewChannelReady(cid ChannelID, npcp *btcec.PublicKey) *ChannelReady {
 	return &ChannelReady{
 		ChanID:                 cid,
 		NextPerCommitmentPoint: npcp,
diff --git a/lnwire/lnwire_test.go b/lnwire/lnwire_test.go
index d55b4efda..baefa4a6a 100644
--- a/lnwire/lnwire_test.go
+++ b/lnwire/lnwire_test.go
@@ -580,7 +580,7 @@ func TestLightningWireProtocol(t *testing.T) {
 				return
 			}
 
-			req := NewFundingLocked(ChannelID(c), pubKey)
+			req := NewChannelReady(ChannelID(c), pubKey)
 
 			v[0] = reflect.ValueOf(*req)
 		},
diff --git a/lnwire/message_test.go b/lnwire/message_test.go
index b016fc35c..1d540455f 100644
--- a/lnwire/message_test.go
+++ b/lnwire/message_test.go
@@ -452,7 +452,7 @@ func newMsgFundingLocked(t testing.TB, r io.Reader) *lnwire.ChannelReady {
 
 	pubKey := randPubKey(t)
 
-	msg := lnwire.NewFundingLocked(lnwire.ChannelID(c), pubKey)
+	msg := lnwire.NewChannelReady(lnwire.ChannelID(c), pubKey)
 	msg.ExtraData = createExtraData(t, r)
 
 	return msg
diff --git a/peer/brontide.go b/peer/brontide.go
index fda3f01e1..7064805f7 100644
--- a/peer/brontide.go
+++ b/peer/brontide.go
@@ -746,7 +746,7 @@ func (p *Brontide) loadActiveChannels(chans []*channeldb.OpenChannel) (
 					return nil, err
 				}
 
-				fundingLockedMsg := lnwire.NewFundingLocked(
+				fundingLockedMsg := lnwire.NewChannelReady(
 					chanID, second,
 				)
 				fundingLockedMsg.AliasScid = &aliasScid