diff --git a/src/business/business-core/gncInvoice.c b/src/business/business-core/gncInvoice.c
index 1826fccad3..0bbbcf1124 100644
--- a/src/business/business-core/gncInvoice.c
+++ b/src/business/business-core/gncInvoice.c
@@ -576,7 +576,7 @@ gboolean gncInvoiceIsDirty (GncInvoice *invoice)
 static void
 gncInvoiceDetachFromLot (GNCLot *lot)
 {
-  kvp_frame *kvp;
+  KvpFrame *kvp;
 
   if (!lot) return;
 
@@ -587,8 +587,8 @@ gncInvoiceDetachFromLot (GNCLot *lot)
 static void
 gncInvoiceAttachToLot (GncInvoice *invoice, GNCLot *lot)
 {
-  kvp_frame *kvp;
-  kvp_value *value;
+  KvpFrame *kvp;
+  KvpValue *value;
   
   if (!invoice || !lot)
     return;
@@ -604,8 +604,8 @@ gncInvoiceAttachToLot (GncInvoice *invoice, GNCLot *lot)
 
 GncInvoice * gncInvoiceGetInvoiceFromLot (GNCLot *lot)
 {
-  kvp_frame *kvp;
-  kvp_value *value;
+  KvpFrame *kvp;
+  KvpValue *value;
   GUID *guid;
   QofBook *book;
 
@@ -625,8 +625,8 @@ GncInvoice * gncInvoiceGetInvoiceFromLot (GNCLot *lot)
 static void
 gncInvoiceAttachToTxn (GncInvoice *invoice, Transaction *txn)
 {
-  kvp_frame *kvp;
-  kvp_value *value;
+  KvpFrame *kvp;
+  KvpValue *value;
   
   if (!invoice || !txn)
     return;
@@ -645,8 +645,8 @@ gncInvoiceAttachToTxn (GncInvoice *invoice, Transaction *txn)
 
 GncInvoice * gncInvoiceGetInvoiceFromTxn (Transaction *txn)
 {
-  kvp_frame *kvp;
-  kvp_value *value;
+  KvpFrame *kvp;
+  KvpValue *value;
   GUID *guid;
   QofBook *book;
 
diff --git a/src/business/business-core/gncOwner.c b/src/business/business-core/gncOwner.c
index 690db84ad7..bbb7ec672e 100644
--- a/src/business/business-core/gncOwner.c
+++ b/src/business/business-core/gncOwner.c
@@ -242,8 +242,8 @@ const GUID * gncOwnerGetEndGUID (GncOwner *owner)
 
 void gncOwnerAttachToLot (GncOwner *owner, GNCLot *lot)
 {
-  kvp_frame *kvp;
-  kvp_value *value;
+  KvpFrame *kvp;
+  KvpValue *value;
   
   if (!owner || !lot)
     return;
@@ -262,8 +262,8 @@ void gncOwnerAttachToLot (GncOwner *owner, GNCLot *lot)
 
 gboolean gncOwnerGetOwnerFromLot (GNCLot *lot, GncOwner *owner)
 {
-  kvp_frame *kvp;
-  kvp_value *value;
+  KvpFrame *kvp;
+  KvpValue *value;
   GUID *guid;
   QofBook *book;
   GncOwnerType type;