diff --git a/lightning/src/offers/invoice.rs b/lightning/src/offers/invoice.rs
index 551f365108..125fb8dda3 100644
--- a/lightning/src/offers/invoice.rs
+++ b/lightning/src/offers/invoice.rs
@@ -771,7 +771,6 @@ macro_rules! invoice_accessors { ($self: ident, $contents: expr) => {
 	}
 } }
 
-
 macro_rules! invoice_accessors_signing_pubkey {
 	($self: ident, $contents: expr, $invoice_type: ty) =>
 {
@@ -794,8 +793,8 @@ macro_rules! invoice_accessors_signing_pubkey {
 } }
 
 impl UnsignedBolt12Invoice {
-	invoice_accessors_common!(self, self.contents, Bolt12Invoice);
-	invoice_accessors_signing_pubkey!(self, self.contents, Bolt12Invoice);
+	invoice_accessors_common!(self, self.contents, UnsignedBolt12Invoice);
+	invoice_accessors_signing_pubkey!(self, self.contents, UnsignedBolt12Invoice);
 	invoice_accessors!(self, self.contents);
 }
 
diff --git a/lightning/src/offers/static_invoice.rs b/lightning/src/offers/static_invoice.rs
index 81fc8bc3b0..bf88bd9446 100644
--- a/lightning/src/offers/static_invoice.rs
+++ b/lightning/src/offers/static_invoice.rs
@@ -295,8 +295,8 @@ impl UnsignedStaticInvoice {
 		Ok(StaticInvoice { bytes: self.bytes, contents: self.contents, signature })
 	}
 
-	invoice_accessors_common!(self, self.contents, StaticInvoice);
-	invoice_accessors_signing_pubkey!(self, self.contents, StaticInvoice);
+	invoice_accessors_common!(self, self.contents, UnsignedStaticInvoice);
+	invoice_accessors_signing_pubkey!(self, self.contents, UnsignedStaticInvoice);
 	invoice_accessors!(self, self.contents);
 }