diff --git a/lnwallet/btcwallet/signer.go b/lnwallet/btcwallet/signer.go
index 6cf46466c..da4e0297f 100644
--- a/lnwallet/btcwallet/signer.go
+++ b/lnwallet/btcwallet/signer.go
@@ -206,39 +206,32 @@ func (b *BtcWallet) ComputeInputScript(tx *wire.MsgTx,
 // interface.
 var _ lnwallet.Signer = (*BtcWallet)(nil)
 
-// FundingSigner responsible for signing the data with the keys that were
-// generated by the wallet. At the moment of creation it is used for signing
-// the data with funding keys.
-type FundingSigner struct {
-	wallet *BtcWallet
-}
-
-// NewFundingSigner creates new instance of signer.
-func NewFundingSigner(wallet *BtcWallet) *FundingSigner {
-	return &FundingSigner{
-		wallet: wallet,
-	}
-}
-
-// SignData sign given data with the private key which corresponds to the given
-// public key.
+// SignMessage attempts to sign a target message with the private key that
+// corresponds to the passed public key. If the target private key is unable to
+// be found, then an error will be returned. The actual digest signed is the
+// double SHA-256 of the passed message.
 //
-// NOTE: This is a part of the DataSigner interface.
-func (s *FundingSigner) SignData(data []byte,
-	pubKey *btcec.PublicKey) (*btcec.Signature, error) {
+// NOTE: This is a part of the MessageSigner interface.
+func (b *BtcWallet) SignMessage(pubKey *btcec.PublicKey,
+	msg []byte) (*btcec.Signature, error) {
 
 	// First attempt to fetch the private key which corresponds to the
 	// specified public key.
-	privKey, err := s.wallet.fetchPrivKey(pubKey)
+	privKey, err := b.fetchPrivKey(pubKey)
 	if err != nil {
 		return nil, err
 	}
 
-	// Double hash and sign data.
-	sign, err := privKey.Sign(chainhash.DoubleHashB(data))
+	// Double hash and sign the data.
+	msgDigest := chainhash.DoubleHashB(msg)
+	sign, err := privKey.Sign(msgDigest)
 	if err != nil {
 		return nil, errors.Errorf("unable sign the message: %v", err)
 	}
 
 	return sign, nil
 }
+
+// A compile time check to ensure that BtcWallet implements the MessageSigner
+// interface.
+var _ lnwallet.MessageSigner = (*BtcWallet)(nil)