diff --git a/lib/libqof/qof/gnc-numeric.h b/lib/libqof/qof/gnc-numeric.h
index edb88bfb2b..f6d7524006 100644
--- a/lib/libqof/qof/gnc-numeric.h
+++ b/lib/libqof/qof/gnc-numeric.h
@@ -451,7 +451,7 @@ gnc_numeric gnc_numeric_reduce(gnc_numeric in);
   @{
 */
 GType gnc_numeric_get_type( void );
-#define GNC_NUMERIC (gnc_numeric_get_type ())
+#define GNC_TYPE_NUMERIC (gnc_numeric_get_type ())
 
 /** @} */
 
diff --git a/src/engine/Account.c b/src/engine/Account.c
index d9915ddf1e..e40c9e11f5 100644
--- a/src/engine/Account.c
+++ b/src/engine/Account.c
@@ -617,7 +617,7 @@ gnc_account_class_init (AccountClass *klass)
                             "all of the splits after some certain date, and "
                             "the 'starting balance' will represent the "
                             "summation of the splits up to that date.",
-                            GNC_NUMERIC,
+                            GNC_TYPE_NUMERIC,
                             G_PARAM_READWRITE));
 
     g_object_class_install_property
@@ -634,7 +634,7 @@ gnc_account_class_init (AccountClass *klass)
                             "some certain date, and the 'starting cleared "
                             "balance' will represent the summation of the "
                             "splits up to that date.",
-                            GNC_NUMERIC,
+                            GNC_TYPE_NUMERIC,
                             G_PARAM_READWRITE));
 
     g_object_class_install_property
@@ -651,7 +651,7 @@ gnc_account_class_init (AccountClass *klass)
                             "some certain date, and the 'starting recontiled "
                             "balance' will represent the summation of the "
                             "splits up to that date.",
-			     GNC_NUMERIC,
+			     GNC_TYPE_NUMERIC,
 			     G_PARAM_READWRITE));
 
     g_object_class_install_property
@@ -662,7 +662,7 @@ gnc_account_class_init (AccountClass *klass)
                             "This is the current ending balance for the "
                             "account.  It is computed from the sum of the "
                             "starting balance and all splits in the account.",
-                            GNC_NUMERIC,
+                            GNC_TYPE_NUMERIC,
                             G_PARAM_READABLE));
 
     g_object_class_install_property
@@ -674,7 +674,7 @@ gnc_account_class_init (AccountClass *klass)
                             "the account.  It is computed from the sum of the "
                             "starting balance and all cleared splits in the "
                             "account.",
-                            GNC_NUMERIC,
+                            GNC_TYPE_NUMERIC,
                             G_PARAM_READABLE));
 
     g_object_class_install_property
@@ -686,7 +686,7 @@ gnc_account_class_init (AccountClass *klass)
                             "for the account.  It is computed from the sum of "
                             "the starting balance and all reconciled splits "
                             "in the account.",
-                            GNC_NUMERIC,
+                            GNC_TYPE_NUMERIC,
                             G_PARAM_READABLE));
 
     g_object_class_install_property