diff --git a/src/app-utils/option-util.c b/src/app-utils/option-util.c
index 75d65eb0ce..a1f03d6051 100644
--- a/src/app-utils/option-util.c
+++ b/src/app-utils/option-util.c
@@ -274,7 +274,7 @@ gnc_option_db_new_for_type(QofIdType id_type)
 }
 
 void
-gnc_option_db_load_from_kvp(GNCOptionDB* odb, kvp_frame *slots)
+gnc_option_db_load_from_kvp(GNCOptionDB* odb, KvpFrame *slots)
 {
     static SCM kvp_to_scm = SCM_UNDEFINED;
     static SCM kvp_option_path = SCM_UNDEFINED;
@@ -308,7 +308,7 @@ gnc_option_db_load_from_kvp(GNCOptionDB* odb, kvp_frame *slots)
 }
 
 void
-gnc_option_db_save_to_kvp(GNCOptionDB* odb, kvp_frame *slots, gboolean clear_kvp)
+gnc_option_db_save_to_kvp(GNCOptionDB* odb, KvpFrame *slots, gboolean clear_kvp)
 {
     static SCM scm_to_kvp = SCM_UNDEFINED;
     static SCM kvp_option_path = SCM_UNDEFINED;
diff --git a/src/app-utils/option-util.h b/src/app-utils/option-util.h
index 5ad66e2ea6..b3b29b94f0 100644
--- a/src/app-utils/option-util.h
+++ b/src/app-utils/option-util.h
@@ -70,8 +70,8 @@ void          gnc_option_db_destroy(GNCOptionDB *odb);
  * in the kvp.
  */
 GNCOptionDB * gnc_option_db_new_for_type(QofIdType id_type);
-void gnc_option_db_load_from_kvp(GNCOptionDB* odb, kvp_frame *slots);
-void gnc_option_db_save_to_kvp(GNCOptionDB* odb, kvp_frame *slots, gboolean clear_kvp);
+void gnc_option_db_load_from_kvp(GNCOptionDB* odb, KvpFrame *slots);
+void gnc_option_db_save_to_kvp(GNCOptionDB* odb, KvpFrame *slots, gboolean clear_kvp);
 
 void gnc_register_kvp_option_generator(QofIdType id_type, SCM generator);
 SCM gnc_make_kvp_options(QofIdType id_type);
diff --git a/src/backend/xml/gnc-account-xml-v2.c b/src/backend/xml/gnc-account-xml-v2.c
index 85d475ec5b..9d31027796 100644
--- a/src/backend/xml/gnc-account-xml-v2.c
+++ b/src/backend/xml/gnc-account-xml-v2.c
@@ -80,7 +80,7 @@ gnc_account_dom_tree_create(Account *act,
                             gboolean allow_incompat)
 {
     const char *str;
-    kvp_frame *kf;
+    KvpFrame *kf;
     xmlNodePtr ret;
     GList *lots, *n;
     Account *parent;
diff --git a/src/backend/xml/gnc-address-xml-v2.c b/src/backend/xml/gnc-address-xml-v2.c
index 1815e0bea5..75cf60da45 100644
--- a/src/backend/xml/gnc-address-xml-v2.c
+++ b/src/backend/xml/gnc-address-xml-v2.c
@@ -72,7 +72,7 @@ xmlNodePtr
 gnc_address_to_dom_tree (const char *tag, GncAddress *addr)
 {
     xmlNodePtr ret;
-    kvp_frame *kf;
+    KvpFrame *kf;
 
     ret = xmlNewNode(NULL, BAD_CAST tag);
     xmlSetProp(ret, BAD_CAST "version", BAD_CAST address_version_string);
diff --git a/src/backend/xml/gnc-entry-xml-v2.c b/src/backend/xml/gnc-entry-xml-v2.c
index 96d0e3b1ff..9e35e8141e 100644
--- a/src/backend/xml/gnc-entry-xml-v2.c
+++ b/src/backend/xml/gnc-entry-xml-v2.c
@@ -118,7 +118,7 @@ entry_dom_tree_create (GncEntry *entry)
     GncTaxTable *taxtable;
     GncOrder *order;
     GncInvoice *invoice;
-    kvp_frame *kf;
+    KvpFrame *kf;
 
     ret = xmlNewNode(NULL, BAD_CAST gnc_entry_string);
     xmlSetProp(ret, BAD_CAST "version", BAD_CAST entry_version_string);
diff --git a/src/backend/xml/gnc-invoice-xml-v2.c b/src/backend/xml/gnc-invoice-xml-v2.c
index 901a73323e..00ad56d1d6 100644
--- a/src/backend/xml/gnc-invoice-xml-v2.c
+++ b/src/backend/xml/gnc-invoice-xml-v2.c
@@ -93,7 +93,7 @@ static xmlNodePtr
 invoice_dom_tree_create (GncInvoice *invoice)
 {
     xmlNodePtr ret;
-    kvp_frame *kf;
+    KvpFrame *kf;
     Timespec ts;
     Transaction *txn;
     GNCLot *lot;
diff --git a/src/backend/xml/gnc-job-xml-v2.c b/src/backend/xml/gnc-job-xml-v2.c
index 6a6f513c60..59f450750c 100644
--- a/src/backend/xml/gnc-job-xml-v2.c
+++ b/src/backend/xml/gnc-job-xml-v2.c
@@ -69,7 +69,7 @@ static xmlNodePtr
 job_dom_tree_create (GncJob *job)
 {
     xmlNodePtr ret;
-    kvp_frame *kf;
+    KvpFrame *kf;
 
     ret = xmlNewNode(NULL, BAD_CAST gnc_job_string);
     xmlSetProp(ret, BAD_CAST "version", BAD_CAST job_version_string);
diff --git a/src/backend/xml/gnc-lot-xml-v2.c b/src/backend/xml/gnc-lot-xml-v2.c
index 503e9816d4..afe681afa5 100644
--- a/src/backend/xml/gnc-lot-xml-v2.c
+++ b/src/backend/xml/gnc-lot-xml-v2.c
@@ -60,7 +60,7 @@ xmlNodePtr
 gnc_lot_dom_tree_create(GNCLot *lot)
 {
     xmlNodePtr ret;
-    kvp_frame *kf;
+    KvpFrame *kf;
 
     ENTER("(lot=%p)", lot);
     ret = xmlNewNode(NULL, BAD_CAST gnc_lot_string);
diff --git a/src/backend/xml/gnc-order-xml-v2.c b/src/backend/xml/gnc-order-xml-v2.c
index cb5fdfbcc6..40fb6777e8 100644
--- a/src/backend/xml/gnc-order-xml-v2.c
+++ b/src/backend/xml/gnc-order-xml-v2.c
@@ -79,7 +79,7 @@ order_dom_tree_create (GncOrder *order)
 {
     xmlNodePtr ret;
     Timespec ts;
-    kvp_frame *kf;
+    KvpFrame *kf;
 
     ret = xmlNewNode(NULL, BAD_CAST gnc_order_string);
     xmlSetProp(ret, BAD_CAST "version", BAD_CAST order_version_string);
diff --git a/src/backend/xml/gnc-tax-table-xml-v2.c b/src/backend/xml/gnc-tax-table-xml-v2.c
index e427a2bfc9..dda332ccab 100644
--- a/src/backend/xml/gnc-tax-table-xml-v2.c
+++ b/src/backend/xml/gnc-tax-table-xml-v2.c
@@ -107,7 +107,7 @@ taxtable_dom_tree_create (GncTaxTable *table)
 {
     xmlNodePtr ret, entries;
     GList *list;
-    kvp_frame *kf;
+    KvpFrame *kf;
 
     ret = xmlNewNode(NULL, BAD_CAST gnc_taxtable_string);
     xmlSetProp(ret, BAD_CAST "version", BAD_CAST taxtable_version_string);
diff --git a/src/backend/xml/io-gncxml-v1.c b/src/backend/xml/io-gncxml-v1.c
index 30956fe94c..536c5c9290 100644
--- a/src/backend/xml/io-gncxml-v1.c
+++ b/src/backend/xml/io-gncxml-v1.c
@@ -413,8 +413,8 @@ gnc_is_xml_data_file(const gchar *filename)
        </s>
      </kvp-frame>
 
-   and return a kvp_frame*.  The start handler for the top allocates
-   the kvp_frame* and passes it to the children.  The <s> blocks add
+   and return a KvpFrame*.  The start handler for the top allocates
+   the KvpFrame* and passes it to the children.  The <s> blocks add
    slots according to their <k> (key) and value blocks.
 
    FIXME: right now this is totally inappropriate for cases where we
@@ -738,7 +738,7 @@ glist_kvp_value_parser_new(sixtp *kvp_frame_parser)
 
    kvp-frame slot handler.
 
-   input: kvp_frame*
+   input: KvpFrame*
    returns: NA
 
    start: NA
@@ -759,7 +759,7 @@ kvp_frame_slot_end_handler(gpointer data_for_children,
                            gpointer parent_data, gpointer global_data,
                            gpointer *result, const gchar *tag)
 {
-    kvp_frame *f = (kvp_frame *) parent_data;
+    KvpFrame *f = (KvpFrame *) parent_data;
     GSList *lp;
     guint64 key_node_count;
     gchar *key = NULL;
@@ -787,7 +787,7 @@ kvp_frame_slot_end_handler(gpointer data_for_children,
         {
             if (is_child_result_from_node_named(cr, "frame"))
             {
-                kvp_frame *frame = cr->data;
+                KvpFrame *frame = cr->data;
                 value = kvp_value_new_frame (frame);
                 delete_value = TRUE;
             }
@@ -858,16 +858,16 @@ kvp_frame_slot_parser_new(sixtp *kvp_frame_parser)
 /* <kvp-frame> - can be used anywhere.
 
    input: NA
-   returns: kvp_frame*
+   returns: KvpFrame*
 
-   start: Allocates kvp_frame* and places in data_for_children.
+   start: Allocates KvpFrame* and places in data_for_children.
    characters: none (whitespace only).
-   end: put kvp_frame* into result if everything's OK.
+   end: put KvpFrame* into result if everything's OK.
 
-   cleanup-result: delete kvp_frame*
+   cleanup-result: delete KvpFrame*
    cleanup-chars: NA
-   fail: delete kvp_frame*
-   result-fail: delete kvp_frame*
+   fail: delete KvpFrame*
+   result-fail: delete KvpFrame*
    chars-fail: NA
 
  */
@@ -877,7 +877,7 @@ kvp_frame_start_handler(GSList* sibling_data, gpointer parent_data,
                         gpointer global_data, gpointer *data_for_children,
                         gpointer *result, const gchar *tag, gchar **attrs)
 {
-    kvp_frame *f = kvp_frame_new();
+    KvpFrame *f = kvp_frame_new();
     g_return_val_if_fail(f, FALSE);
     *data_for_children = f;
     return(TRUE);
@@ -889,7 +889,7 @@ kvp_frame_end_handler(gpointer data_for_children,
                       gpointer parent_data, gpointer global_data,
                       gpointer *result, const gchar *tag)
 {
-    kvp_frame *f = (kvp_frame *) data_for_children;
+    KvpFrame *f = (KvpFrame *) data_for_children;
     g_return_val_if_fail(f, FALSE);
     *result = f;
     return(TRUE);
@@ -904,14 +904,14 @@ kvp_frame_fail_handler(gpointer data_for_children,
                        gpointer *result,
                        const gchar *tag)
 {
-    kvp_frame *f = (kvp_frame *) data_for_children;
+    KvpFrame *f = (KvpFrame *) data_for_children;
     if (f) kvp_frame_delete(f);
 }
 
 static void
 kvp_frame_result_cleanup(sixtp_child_result *cr)
 {
-    kvp_frame *f = (kvp_frame *) cr->data;;
+    KvpFrame *f = (KvpFrame *) cr->data;;
     if (f) kvp_frame_delete(f);
 }
 
@@ -1244,7 +1244,7 @@ account_restore_after_child_handler(gpointer data_for_children,
     if (child_result->type != SIXTP_CHILD_RESULT_NODE) return(TRUE);
     if (strcmp(child_result->tag, "slots") == 0)
     {
-        kvp_frame *f = (kvp_frame *) child_result->data;
+        KvpFrame *f = (KvpFrame *) child_result->data;
         g_return_val_if_fail(f, FALSE);
         if (a->inst.kvp_data) kvp_frame_delete(a->inst.kvp_data);
         a->inst.kvp_data = f;
@@ -2173,7 +2173,7 @@ txn_restore_after_child_handler(gpointer data_for_children,
     if (child_result->type != SIXTP_CHILD_RESULT_NODE) return(TRUE);
     if (strcmp(child_result->tag, "slots") == 0)
     {
-        kvp_frame *f = (kvp_frame *) child_result->data;
+        KvpFrame *f = (KvpFrame *) child_result->data;
         g_return_val_if_fail(f, FALSE);
         qof_instance_set_slots(QOF_INSTANCE(trans), f);
         child_result->should_cleanup = FALSE;
@@ -2478,7 +2478,7 @@ txn_restore_split_after_child_handler(gpointer data_for_children,
 
     if (strcmp(child_result->tag, "slots") == 0)
     {
-        kvp_frame *f = (kvp_frame *) child_result->data;
+        KvpFrame *f = (KvpFrame *) child_result->data;
         g_return_val_if_fail(f, FALSE);
         if (s->inst.kvp_data) kvp_frame_delete(s->inst.kvp_data);
         s->inst.kvp_data = f;
diff --git a/src/backend/xml/sixtp-dom-generators.c b/src/backend/xml/sixtp-dom-generators.c
index bb4fd6bb42..0fc8e741a8 100644
--- a/src/backend/xml/sixtp-dom-generators.c
+++ b/src/backend/xml/sixtp-dom-generators.c
@@ -341,7 +341,7 @@ add_kvp_value_node(xmlNodePtr node, gchar *tag, KvpValue* val)
     break;
     case KVP_TYPE_FRAME:
     {
-        kvp_frame *frame;
+        KvpFrame *frame;
 
         xmlSetProp(val_node, BAD_CAST "type", BAD_CAST "frame");
 
@@ -373,7 +373,7 @@ add_kvp_slot(gpointer key, gpointer value, gpointer data)
 }
 
 xmlNodePtr
-kvp_frame_to_dom_tree(const char *tag, const kvp_frame *frame)
+kvp_frame_to_dom_tree(const char *tag, const KvpFrame *frame)
 {
     xmlNodePtr ret;
 
diff --git a/src/backend/xml/sixtp-dom-generators.h b/src/backend/xml/sixtp-dom-generators.h
index 10c164d8fb..9a8b3b71cf 100644
--- a/src/backend/xml/sixtp-dom-generators.h
+++ b/src/backend/xml/sixtp-dom-generators.h
@@ -43,7 +43,7 @@ gchar * timespec_nsec_to_string(const Timespec *ts);
 gchar * timespec_sec_to_string(const Timespec *ts);
 xmlNodePtr gdate_to_dom_tree(const char *tag, const GDate *spec);
 xmlNodePtr gnc_numeric_to_dom_tree(const char *tag, const gnc_numeric *num);
-xmlNodePtr kvp_frame_to_dom_tree(const char *tag, const kvp_frame *frame);
+xmlNodePtr kvp_frame_to_dom_tree(const char *tag, const KvpFrame *frame);
 xmlNodePtr guint_to_dom_tree(const char *tag, guint an_int);
 xmlNodePtr recurrence_to_dom_tree(const gchar *tag, const Recurrence *r);
 
diff --git a/src/backend/xml/sixtp-dom-parsers.c b/src/backend/xml/sixtp-dom-parsers.c
index 47947e1a1b..1eb9c03bb3 100644
--- a/src/backend/xml/sixtp-dom-parsers.c
+++ b/src/backend/xml/sixtp-dom-parsers.c
@@ -332,7 +332,7 @@ dom_tree_to_list_kvp_value(xmlNodePtr node)
 KvpValue*
 dom_tree_to_frame_kvp_value(xmlNodePtr node)
 {
-    kvp_frame *frame;
+    KvpFrame *frame;
     KvpValue *ret = NULL;
 
     frame = dom_tree_to_kvp_frame(node);
@@ -404,7 +404,7 @@ dom_tree_to_kvp_value(xmlNodePtr node)
 }
 
 gboolean
-dom_tree_to_kvp_frame_given(xmlNodePtr node, kvp_frame *frame)
+dom_tree_to_kvp_frame_given(xmlNodePtr node, KvpFrame *frame)
 {
     xmlNodePtr mark;
 
@@ -455,10 +455,10 @@ dom_tree_to_kvp_frame_given(xmlNodePtr node, kvp_frame *frame)
 }
 
 
-kvp_frame*
+KvpFrame*
 dom_tree_to_kvp_frame(xmlNodePtr node)
 {
-    kvp_frame *ret;
+    KvpFrame *ret;
 
     g_return_val_if_fail(node, NULL);
 
diff --git a/src/backend/xml/sixtp-dom-parsers.h b/src/backend/xml/sixtp-dom-parsers.h
index 4b2019bed0..b48f8b5fcd 100644
--- a/src/backend/xml/sixtp-dom-parsers.h
+++ b/src/backend/xml/sixtp-dom-parsers.h
@@ -47,9 +47,9 @@ gnc_numeric* dom_tree_to_gnc_numeric(xmlNodePtr node);
 gchar * dom_tree_to_text(xmlNodePtr tree);
 gboolean string_to_binary(const gchar *str,  void **v, guint64 *data_len);
 
-gboolean dom_tree_to_kvp_frame_given(xmlNodePtr node, kvp_frame *frame);
+gboolean dom_tree_to_kvp_frame_given(xmlNodePtr node, KvpFrame *frame);
 
-kvp_frame* dom_tree_to_kvp_frame(xmlNodePtr node);
+KvpFrame* dom_tree_to_kvp_frame(xmlNodePtr node);
 KvpValue* dom_tree_to_kvp_value(xmlNodePtr node);
 KvpValue* dom_tree_to_integer_kvp_value(xmlNodePtr node);
 KvpValue* dom_tree_to_double_kvp_value(xmlNodePtr node);
diff --git a/src/backend/xml/test/test-file-stuff.c b/src/backend/xml/test/test-file-stuff.c
index 93380fd0cf..2385d385fb 100644
--- a/src/backend/xml/test/test-file-stuff.c
+++ b/src/backend/xml/test/test-file-stuff.c
@@ -239,9 +239,9 @@ equals_node_val_vs_commodity(xmlNodePtr node, const gnc_commodity *com,
 }
 
 gboolean
-equals_node_val_vs_kvp_frame(xmlNodePtr node, const kvp_frame *frm)
+equals_node_val_vs_kvp_frame(xmlNodePtr node, const KvpFrame *frm)
 {
-    kvp_frame *cmpfrm;
+    KvpFrame *cmpfrm;
 
     g_return_val_if_fail(node, FALSE);
     g_return_val_if_fail(frm, FALSE);
diff --git a/src/backend/xml/test/test-file-stuff.h b/src/backend/xml/test/test-file-stuff.h
index 2619bb3573..08dac546ab 100644
--- a/src/backend/xml/test/test-file-stuff.h
+++ b/src/backend/xml/test/test-file-stuff.h
@@ -30,7 +30,7 @@ gboolean equals_node_val_vs_string(xmlNodePtr node, const gchar* str);
 gboolean equals_node_val_vs_guid(xmlNodePtr node, const GncGUID *id);
 gboolean equals_node_val_vs_commodity(xmlNodePtr node,
                                       const gnc_commodity *com, QofBook *);
-gboolean equals_node_val_vs_kvp_frame(xmlNodePtr node, const kvp_frame *frm);
+gboolean equals_node_val_vs_kvp_frame(xmlNodePtr node, const KvpFrame *frm);
 gboolean equals_node_val_vs_date(xmlNodePtr node, const Timespec tm);
 gboolean equals_node_val_vs_int(xmlNodePtr node, gint64 val);
 gboolean equals_node_val_vs_boolean(xmlNodePtr node, gboolean val);
diff --git a/src/engine/Account.c b/src/engine/Account.c
index 9c76fa35f1..88e00f2e89 100644
--- a/src/engine/Account.c
+++ b/src/engine/Account.c
@@ -5014,7 +5014,7 @@ xaccAccountForEachTransaction(const Account *acc, TransactionCallback proc,
 
 typedef struct _GncImportMatchMap
 {
-    kvp_frame *	frame;
+    KvpFrame *	frame;
     Account *	acc;
     QofBook *	book;
 } GncImportMatchMap;
@@ -5035,7 +5035,7 @@ GncImportMatchMap *
 gnc_account_create_imap (Account *acc)
 {
     GncImportMatchMap *imap;
-    kvp_frame *frame;
+    KvpFrame *frame;
 
     if (!acc) return NULL;
     frame = qof_instance_get_slots (QOF_INSTANCE (acc));
@@ -5256,7 +5256,7 @@ gnc_imap_find_account_bayes (GncImportMatchMap *imap, GList *tokens)
 						       g_str_equal);
     struct account_info account_i;
     KvpValue* value;
-    kvp_frame* token_frame;
+    KvpFrame* token_frame;
 
     ENTER(" ");
 
diff --git a/src/engine/Scrub.c b/src/engine/Scrub.c
index 497297ebf0..2e392a2cbc 100644
--- a/src/engine/Scrub.c
+++ b/src/engine/Scrub.c
@@ -1251,7 +1251,7 @@ xaccAccountScrubKvp (Account *account)
 {
     const gchar *str;
     gchar *str2;
-    kvp_frame *frame;
+    KvpFrame *frame;
 
     if (!account) return;
 
diff --git a/src/engine/test-core/test-engine-stuff.h b/src/engine/test-core/test-engine-stuff.h
index db51b02051..f4f20ec03b 100644
--- a/src/engine/test-core/test-engine-stuff.h
+++ b/src/engine/test-core/test-engine-stuff.h
@@ -27,7 +27,7 @@ typedef struct
 
 bin_data* get_random_binary_data(void);
 
-kvp_frame* get_random_kvp_frame(void);
+KvpFrame* get_random_kvp_frame(void);
 gnc_numeric get_random_gnc_numeric(void);
 GncGUID* get_random_guid(void);
 GList* get_random_glist(void);
diff --git a/src/import-export/aqb/gnc-ab-kvp.c b/src/import-export/aqb/gnc-ab-kvp.c
index cb9f1bccbc..ee1b33021b 100644
--- a/src/import-export/aqb/gnc-ab-kvp.c
+++ b/src/import-export/aqb/gnc-ab-kvp.c
@@ -118,7 +118,7 @@ gnc_ab_set_account_trans_retrieval(Account *a, Timespec time)
 
 #define AB_KEY "hbci"
 #define AB_TEMPLATES "template-list"
-static kvp_frame *gnc_ab_get_book_kvp(QofBook *b, gboolean create);
+static KvpFrame *gnc_ab_get_book_kvp(QofBook *b, gboolean create);
 
 
 /* EFFECTIVE FRIEND FUNCTION */
@@ -129,7 +129,7 @@ extern void qof_instance_set_dirty_flag (gconstpointer inst, gboolean flag);
 GList *
 gnc_ab_get_book_template_list(QofBook *b)
 {
-    kvp_frame *frame = gnc_ab_get_book_kvp(b, FALSE);
+    KvpFrame *frame = gnc_ab_get_book_kvp(b, FALSE);
     KvpValue *value = kvp_frame_get_slot(frame, AB_TEMPLATES);
     return kvp_value_get_glist(value);
 }
@@ -137,17 +137,17 @@ gnc_ab_get_book_template_list(QofBook *b)
 void
 gnc_ab_set_book_template_list(QofBook *b, GList *template_list)
 {
-    kvp_frame *frame = gnc_ab_get_book_kvp(b, TRUE);
+    KvpFrame *frame = gnc_ab_get_book_kvp(b, TRUE);
     KvpValue *value = kvp_value_new_glist_nc(template_list);
     kvp_frame_set_slot_nc(frame, AB_TEMPLATES, value);
     qof_instance_set_dirty_flag(QOF_INSTANCE(b), TRUE);
 }
 
-static kvp_frame *
+static KvpFrame *
 gnc_ab_get_book_kvp(QofBook *b, gboolean create)
 {
-    kvp_frame *toplevel = qof_instance_get_slots(QOF_INSTANCE(b));
-    kvp_frame *result = kvp_frame_get_frame(toplevel, AB_KEY);
+    KvpFrame *toplevel = qof_instance_get_slots(QOF_INSTANCE(b));
+    KvpFrame *result = kvp_frame_get_frame(toplevel, AB_KEY);
     if (!result && create)
     {
         result = kvp_frame_new();
diff --git a/src/import-export/aqb/gnc-ab-trans-templ.c b/src/import-export/aqb/gnc-ab-trans-templ.c
index 1da7ed155d..f76e57416a 100644
--- a/src/import-export/aqb/gnc-ab-trans-templ.c
+++ b/src/import-export/aqb/gnc-ab-trans-templ.c
@@ -34,7 +34,7 @@
 /* This static indicates the debugging module that this .o belongs to.  */
 G_GNUC_UNUSED static QofLogModule log_module = G_LOG_DOMAIN;
 
-/* kvp_frame slot names */
+/* KvpFrame slot names */
 #define TT_NAME "name"
 #define TT_RNAME "rnam"
 #define TT_RACC "racc"
@@ -90,7 +90,7 @@ gnc_ab_trans_templ_new_full(const char *name, const char *recp_name,
 }
 
 GncABTransTempl *
-gnc_ab_trans_templ_new_from_kvp(const kvp_frame *k)
+gnc_ab_trans_templ_new_from_kvp(const KvpFrame *k)
 {
     g_return_val_if_fail(k, NULL);
 
@@ -112,7 +112,7 @@ gnc_ab_trans_templ_list_new_from_kvp_list(GList *v)
 
     for (iter = v; iter; iter = iter->next)
     {
-        kvp_frame *frame = kvp_value_get_frame((KvpValue*) iter->data);
+        KvpFrame *frame = kvp_value_get_frame((KvpValue*) iter->data);
         res = g_list_prepend(res, gnc_ab_trans_templ_new_from_kvp(frame));
     }
     res = g_list_reverse(res);
@@ -143,10 +143,10 @@ gnc_ab_trans_templ_list_free(GList *l)
     g_list_free(l);
 }
 
-kvp_frame *
+KvpFrame *
 gnc_ab_trans_templ_to_kvp(const GncABTransTempl *t)
 {
-    kvp_frame *k;
+    KvpFrame *k;
 
     g_return_val_if_fail(t, NULL);
 
diff --git a/src/import-export/aqb/gnc-ab-trans-templ.h b/src/import-export/aqb/gnc-ab-trans-templ.h
index 15b85b3580..2b41c4f950 100644
--- a/src/import-export/aqb/gnc-ab-trans-templ.h
+++ b/src/import-export/aqb/gnc-ab-trans-templ.h
@@ -67,16 +67,16 @@ GncABTransTempl *gnc_ab_trans_templ_new_full(
     const gchar *purpose_cont);
 
 /**
- * Create a template, taking the values from a kvp_frame.
+ * Create a template, taking the values from a KvpFrame.
  *
- * @param k kvp_frame
+ * @param k KvpFrame
  * @return A newly allocated GncABTransTempl
  */
-GncABTransTempl *gnc_ab_trans_templ_new_from_kvp(const kvp_frame *k);
+GncABTransTempl *gnc_ab_trans_templ_new_from_kvp(const KvpFrame *k);
 
 /**
  * Create a list of templates from a list of kvp_values which in turn
- * contain a kvp_frame.
+ * contain a KvpFrame.
  *
  * @param v GList of kvp_values
  * @return A GList of newly allocated GncABTransTempls
@@ -98,15 +98,15 @@ void gnc_ab_trans_templ_free(GncABTransTempl *t);
 void gnc_ab_trans_templ_list_free(GList *l);
 
 /**
- * Create a kvp_frame a given template.
+ * Create a KvpFrame a given template.
  *
  * @param t Template
- * @return A newly allocated kvp_frame
+ * @return A newly allocated KvpFrame
  */
-kvp_frame *gnc_ab_trans_templ_to_kvp(const GncABTransTempl *t);
+KvpFrame *gnc_ab_trans_templ_to_kvp(const GncABTransTempl *t);
 
 /**
- * Create a list of kvp_values, which in turn contain a kvp_frame, from a list
+ * Create a list of kvp_values, which in turn contain a KvpFrame, from a list
  * of templates.
  *
  * @param k GList of GncABTransTempls
diff --git a/src/libqof/qof/kvp_frame.h b/src/libqof/qof/kvp_frame.h
index 810e064e05..aa8ed2c89b 100644
--- a/src/libqof/qof/kvp_frame.h
+++ b/src/libqof/qof/kvp_frame.h
@@ -107,8 +107,7 @@ typedef enum
 /** \deprecated Deprecated backwards compat token
 
 do \b not use these in new code.
-*/
-#define kvp_frame KvpFrame
+ */
 /** \deprecated Deprecated backwards compat token */
 #define kvp_value_t KvpValueType
 
diff --git a/src/register/ledger-core/split-register-model-save.c b/src/register/ledger-core/split-register-model-save.c
index 60582d4b7e..f456daaeb5 100644
--- a/src/register/ledger-core/split-register-model-save.c
+++ b/src/register/ledger-core/split-register-model-save.c
@@ -660,7 +660,7 @@ gnc_template_register_save_xfrm_cell (BasicCell * cell,
     SRInfo *info = gnc_split_register_get_info (reg);
     Account *template_acc;
     const GncGUID *acctGUID;
-    kvp_frame *kvpf;
+    KvpFrame *kvpf;
     Account *acct;
 
     g_return_if_fail (gnc_basic_cell_has_name (cell, XFRM_CELL));