Stuff

Index: src/register/register-gnome/gncmod-register-gnome.c
===================================================================
--- src/register/register-gnome/gncmod-register-gnome.c	(revision 15920)
+++ src/register/register-gnome/gncmod-register-gnome.c	(working copy)
@@ -20,31 +20,31 @@
 #include "table-gnome.h"
 
 /* version of the gnc module system interface we require */
-int gnc_module_system_interface = 0;
+int libgncmod_register_gnome_gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int gnc_module_current  = 0;
-int gnc_module_revision = 0;
-int gnc_module_age      = 0;
+int libgncmod_register_gnome_gnc_module_current  = 0;
+int libgncmod_register_gnome_gnc_module_revision = 0;
+int libgncmod_register_gnome_gnc_module_age      = 0;
 
 
 char *
-gnc_module_path(void) {
+libgncmod_register_gnome_gnc_module_path(void) {
   return g_strdup("gnucash/register/register-gnome");
 }
 
 char *
-gnc_module_description(void) {
+libgncmod_register_gnome_gnc_module_description(void) {
   return g_strdup("Gnome GUI for ledger-like table displays");
 }
 
 int
-gnc_module_init(int refcount) {
-  if(!gnc_module_load("gnucash/register/register-core", 0)) {
+libgncmod_register_gnome_gnc_module_init(int refcount) {
+  if(!libgncmod_register_gnome_gnc_module_load("gnucash/register/register-core", 0)) {
     return FALSE;
   }
 
-  if(!gnc_module_load("gnucash/gnome-utils", 0)) {
+  if(!libgncmod_register_gnome_gnc_module_load("gnucash/gnome-utils", 0)) {
     return FALSE;
   }
 
Index: src/register/ledger-core/gncmod-ledger-core.c
===================================================================
--- src/register/ledger-core/gncmod-ledger-core.c	(revision 15920)
+++ src/register/ledger-core/gncmod-ledger-core.c	(working copy)
@@ -11,37 +11,37 @@
 #include "gnc-module-api.h"
 
 /* version of the gnc module system interface we require */
-int gnc_module_system_interface = 0;
+int libgncmod_ledger_core_gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int gnc_module_current  = 0;
-int gnc_module_revision = 0;
-int gnc_module_age      = 0;
+int libgncmod_ledger_core_gnc_module_current  = 0;
+int libgncmod_ledger_core_gnc_module_revision = 0;
+int libgncmod_ledger_core_gnc_module_age      = 0;
 
 
 char *
-gnc_module_path(void) {
+libgncmod_ledger_core_gnc_module_path(void) {
   return g_strdup("gnucash/register/ledger-core");
 }
 
 char *
-gnc_module_description(void) {
+libgncmod_ledger_core_gnc_module_description(void) {
   return g_strdup("Toolkit-independent GUI for financial ledgers");
 }
 
 int
-gnc_module_init(int refcount) {
-  if(!gnc_module_load("gnucash/engine", 0))
+libgncmod_ledger_core_gnc_module_init(int refcount) {
+  if(!libgncmod_ledger_core_gnc_module_load("gnucash/engine", 0))
   {
     return FALSE;
   }
 
-  if(!gnc_module_load("gnucash/register/register-core", 0))
+  if(!libgncmod_ledger_core_gnc_module_load("gnucash/register/register-core", 0))
   {
     return FALSE;
   }
 
-  if(!gnc_module_load("gnucash/app-utils", 0))
+  if(!libgncmod_ledger_core_gnc_module_load("gnucash/app-utils", 0))
   {
     return FALSE;
   }
Index: src/register/register-core/gncmod-register-core.c
===================================================================
--- src/register/register-core/gncmod-register-core.c	(revision 15920)
+++ src/register/register-core/gncmod-register-core.c	(working copy)
@@ -13,35 +13,35 @@
 #include "gnc-module-api.h"
 
 /* version of the gnc module system interface we require */
-int gnc_module_system_interface = 0;
+int libgncmod_register_core_gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int gnc_module_current  = 0;
-int gnc_module_revision = 0;
-int gnc_module_age      = 0;
+int libgncmod_register_core_gnc_module_current  = 0;
+int libgncmod_register_core_gnc_module_revision = 0;
+int libgncmod_register_core_gnc_module_age      = 0;
 
 
 char *
-gnc_module_path(void) {
+libgncmod_register_core_gnc_module_path(void) {
   return g_strdup("gnucash/register/register-core");
 }
 
 char *
-gnc_module_description(void) {
+libgncmod_register_core_gnc_module_description(void) {
   return g_strdup("Toolkit-independent GUI for ledger-like table displays");
 }
 
 int
-gnc_module_init(int refcount)
+libgncmod_register_core_gnc_module_init(int refcount)
 {
-  if(!gnc_module_load("gnucash/engine", 0))
+  if(!libgncmod_register_core_gnc_module_load("gnucash/engine", 0))
   {
     return FALSE;
   }
 
   /* FIXME. We need this for the wide-character functions.
    * When fixing, get rid of gnome-utils includes, too. */
-  if(!gnc_module_load("gnucash/gnome-utils", 0))
+  if(!libgncmod_register_core_gnc_module_load("gnucash/gnome-utils", 0))
   {
     return FALSE;
   }
Index: src/backend/file/gncmod-backend-file.c
===================================================================
--- src/backend/file/gncmod-backend-file.c	(revision 15920)
+++ src/backend/file/gncmod-backend-file.c	(working copy)
@@ -13,32 +13,32 @@
 #include "gnc-module-api.h"
 
 /* version of the gnc module system interface we require */
-int gnc_module_system_interface = 0;
+int libgnc_backend_file_utils_gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int gnc_module_current  = 0;
-int gnc_module_revision = 0;
-int gnc_module_age      = 0;
+int libgnc_backend_file_utils_gnc_module_current  = 0;
+int libgnc_backend_file_utils_gnc_module_revision = 0;
+int libgnc_backend_file_utils_gnc_module_age      = 0;
 
 static GNCModule engine;
 
 
 char *
-gnc_module_path(void)
+libgnc_backend_file_utils_gnc_module_path(void)
 {
   return g_strdup("gnucash/backend/file");
 }
 
 char *
-gnc_module_description(void)
+libgnc_backend_file_utils_gnc_module_description(void)
 {
   return g_strdup("The binary and XML (v1 and v2) backends for GnuCash");
 }
 
 int
-gnc_module_init(int refcount)
+libgnc_backend_file_utils_gnc_module_init(int refcount)
 {
-  engine = gnc_module_load("gnucash/engine", 0);
+  engine = libgnc_backend_file_utils_gnc_module_load("gnucash/engine", 0);
   if(!engine) return FALSE;
 
   /* Need to initialize g-type engine for gconf */
@@ -49,12 +49,12 @@
 }
 
 int
-gnc_module_end(int refcount)
+libgnc_backend_file_utils_gnc_module_end(int refcount)
 {
   int unload = TRUE;
 
   if (engine)
-    unload = gnc_module_unload(engine);
+    unload = libgnc_backend_file_utils_gnc_module_unload(engine);
 
   if (refcount == 0)
     engine = NULL;
Index: src/import-export/qif-import/gncmod-qif-import.c
===================================================================
--- src/import-export/qif-import/gncmod-qif-import.c	(revision 15920)
+++ src/import-export/qif-import/gncmod-qif-import.c	(working copy)
@@ -17,40 +17,40 @@
 #include "gnc-plugin-qif-import.h"
 
 /* version of the gnc module system interface we require */
-int gnc_module_system_interface = 0;
+int libgncmod_qif_import_gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int gnc_module_current  = 0;
-int gnc_module_revision = 0;
-int gnc_module_age      = 0;
+int libgncmod_qif_import_gnc_module_current  = 0;
+int libgncmod_qif_import_gnc_module_revision = 0;
+int libgncmod_qif_import_gnc_module_age      = 0;
 
 
 char *
-gnc_module_path(void)
+libgncmod_qif_import_gnc_module_path(void)
 {
   return g_strdup("gnucash/import-export/qif-import");
 }
 
 char *
-gnc_module_description(void)
+libgncmod_qif_import_gnc_module_description(void)
 {
   return g_strdup("Gnome GUI and Scheme code for QIF importer");
 }
 
 int
-gnc_module_init(int refcount)
+libgncmod_qif_import_gnc_module_init(int refcount)
 {
-  if(!gnc_module_load("gnucash/engine", 0))
+  if(!libgncmod_qif_import_gnc_module_load("gnucash/engine", 0))
   {
     return FALSE;
   }
 
-  if(!gnc_module_load("gnucash/app-utils", 0))
+  if(!libgncmod_qif_import_gnc_module_load("gnucash/app-utils", 0))
   {
     return FALSE;
   }
 
-  if(!gnc_module_load("gnucash/gnome-utils", 0))
+  if(!libgncmod_qif_import_gnc_module_load("gnucash/gnome-utils", 0))
   {
     return FALSE;
   }
@@ -72,7 +72,7 @@
 }
 
 int
-gnc_module_end(int refcount)
+libgncmod_qif_import_gnc_module_end(int refcount)
 {
   return TRUE;
 }
Index: src/import-export/binary-import/gncmod-binary-import.c
===================================================================
--- src/import-export/binary-import/gncmod-binary-import.c	(revision 15920)
+++ src/import-export/binary-import/gncmod-binary-import.c	(working copy)
@@ -15,38 +15,38 @@
 #include "druid-commodity.h"
 
 /* version of the gnc module system interface we require */
-int gnc_module_system_interface = 0;
+int libgncmod_binary_import_gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int gnc_module_current  = 0;
-int gnc_module_revision = 0;
-int gnc_module_age      = 0;
+int libgncmod_binary_import_gnc_module_current  = 0;
+int libgncmod_binary_import_gnc_module_revision = 0;
+int libgncmod_binary_import_gnc_module_age      = 0;
 
 
 char *
-gnc_module_path(void) {
+libgncmod_binary_import_gnc_module_path(void) {
   return g_strdup("gnucash/import-export/binary-import");
 }
 
 char *
-gnc_module_description(void) {
+libgncmod_binary_import_gnc_module_description(void) {
   return g_strdup("Utilities importing GnuCash binary files");
 }
 
 int
-gnc_module_init(int refcount) {
+libgncmod_binary_import_gnc_module_init(int refcount) {
   /* load the engine (we depend on it) */
-  if(!gnc_module_load("gnucash/engine", 0)) {
+  if(!libgncmod_binary_import_gnc_module_load("gnucash/engine", 0)) {
     return FALSE;
   }
 
   /* load the calculation module (we depend on it) */
-  if(!gnc_module_load("gnucash/app-utils", 0)) {
+  if(!libgncmod_binary_import_gnc_module_load("gnucash/app-utils", 0)) {
     return FALSE;
   }
 
   /* load the calculation module (we depend on it) */
-  if(!gnc_module_load("gnucash/gnome-utils", 0)) {
+  if(!libgncmod_binary_import_gnc_module_load("gnucash/gnome-utils", 0)) {
     return FALSE;
   }
 
@@ -57,6 +57,6 @@
 }
 
 int
-gnc_module_end(int refcount) {
+libgncmod_binary_import_gnc_module_end(int refcount) {
   return TRUE;
 }
Index: src/import-export/ofx/gncmod-ofx-import.c
===================================================================
--- src/import-export/ofx/gncmod-ofx-import.c	(revision 15920)
+++ src/import-export/ofx/gncmod-ofx-import.c	(working copy)
@@ -33,45 +33,45 @@
 #include "gnc-plugin-ofx.h"
 
 /* version of the gnc module system interface we require */
-int gnc_module_system_interface = 0;
+int libgncmod_ofx_gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int gnc_module_current  = 0;
-int gnc_module_revision = 0;
-int gnc_module_age      = 0;
+int libgncmod_ofx_gnc_module_current  = 0;
+int libgncmod_ofx_gnc_module_revision = 0;
+int libgncmod_ofx_gnc_module_age      = 0;
 
 //static GNCModule bus_core;
 //static GNCModule file;
 
 
 char *
-gnc_module_path(void)
+libgncmod_ofx_gnc_module_path(void)
 {
   return g_strdup("gnucash/import-export/ofx");
 }
 
 char *
-gnc_module_description(void)
+libgncmod_ofx_gnc_module_description(void)
 {
   return g_strdup("Gnome GUI and C code for OFX importer using libofx");
 }
 
 int
-gnc_module_init(int refcount)
+libgncmod_ofx_gnc_module_init(int refcount)
 {
-  if(!gnc_module_load("gnucash/engine", 0))
+  if(!libgncmod_ofx_gnc_module_load("gnucash/engine", 0))
   {
     return FALSE;
   }
-  if(!gnc_module_load("gnucash/app-utils", 0))
+  if(!libgncmod_ofx_gnc_module_load("gnucash/app-utils", 0))
   {
     return FALSE;
   }
-  if(!gnc_module_load("gnucash/gnome-utils", 0))
+  if(!libgncmod_ofx_gnc_module_load("gnucash/gnome-utils", 0))
   {
     return FALSE;
   }
-    if(!gnc_module_load("gnucash/import-export", 0))
+    if(!libgncmod_ofx_gnc_module_load("gnucash/import-export", 0))
   {
     return FALSE;
   }
@@ -83,7 +83,7 @@
 }
 
 int
-gnc_module_end(int refcount)
+libgncmod_ofx_gnc_module_end(int refcount)
 {
   return TRUE;
 }
Index: src/import-export/qif-io-core/gncmod-qifiocore.c
===================================================================
--- src/import-export/qif-io-core/gncmod-qifiocore.c	(revision 15920)
+++ src/import-export/qif-io-core/gncmod-qifiocore.c	(working copy)
@@ -12,33 +12,33 @@
 #include "gnc-module-api.h"
 
 /* version of the gnc module system interface we require */
-int gnc_module_system_interface = 0;
+int libgncmod_qifiocore_gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int gnc_module_current  = 0;
-int gnc_module_revision = 0;
-int gnc_module_age      = 0;
+int libgncmod_qifiocore_gnc_module_current  = 0;
+int libgncmod_qifiocore_gnc_module_revision = 0;
+int libgncmod_qifiocore_gnc_module_age      = 0;
 
 
 char *
-gnc_module_path(void) {
+libgncmod_qifiocore_gnc_module_path(void) {
   return g_strdup("gnucash/qif-io/core");
 }
 
 char *
-gnc_module_description(void) {
+libgncmod_qifiocore_gnc_module_description(void) {
   return g_strdup("Core components of QIF import/export (non-GUI)");
 }
 
 int
-gnc_module_init(int refcount) {
+libgncmod_qifiocore_gnc_module_init(int refcount) {
   /* load the engine (we depend on it) */
-  if(!gnc_module_load("gnucash/engine", 0)) {
+  if(!libgncmod_qifiocore_gnc_module_load("gnucash/engine", 0)) {
     return FALSE;
   }
 
   /* load the engine (we depend on it) */
-  if(!gnc_module_load("gnucash/app-utils", 0)) {
+  if(!libgncmod_qifiocore_gnc_module_load("gnucash/app-utils", 0)) {
     return FALSE;
   }
 
@@ -52,6 +52,6 @@
 }
 
 int
-gnc_module_end(int refcount) {
+libgncmod_qifiocore_gnc_module_end(int refcount) {
   return TRUE;
 }
Index: src/import-export/gncmod-generic-import.c
===================================================================
--- src/import-export/gncmod-generic-import.c	(revision 15920)
+++ src/import-export/gncmod-generic-import.c	(working copy)
@@ -14,39 +14,39 @@
 #include "gnc-module.h"
 #include "gnc-module-api.h"
 /* version of the gnc module system interface we require */
-int gnc_module_system_interface = 0;
+int libgncmod_generic_import_gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int gnc_module_current  = 0;
-int gnc_module_revision = 0;
-int gnc_module_age      = 0;
+int libgncmod_generic_import_gnc_module_current  = 0;
+int libgncmod_generic_import_gnc_module_revision = 0;
+int libgncmod_generic_import_gnc_module_age      = 0;
 
 /*static GNCModule engine; NOTUSED */
 
 char *
-gnc_module_path(void)
+libgncmod_generic_import_gnc_module_path(void)
 {
   return g_strdup("gnucash/import-export");
 }
 
 char *
-gnc_module_description(void)
+libgncmod_generic_import_gnc_module_description(void)
 {
   return g_strdup("Gnome GUI and C code for the generic import functions");
 }
 
 int
-gnc_module_init(int refcount)
+libgncmod_generic_import_gnc_module_init(int refcount)
 {
-  if(!gnc_module_load("gnucash/engine", 0))
+  if(!libgncmod_generic_import_gnc_module_load("gnucash/engine", 0))
   {
     return FALSE;
   }
-  if(!gnc_module_load("gnucash/app-utils", 0))
+  if(!libgncmod_generic_import_gnc_module_load("gnucash/app-utils", 0))
   {
     return FALSE;
   }
-  if(!gnc_module_load("gnucash/gnome-utils", 0))
+  if(!libgncmod_generic_import_gnc_module_load("gnucash/gnome-utils", 0))
   {
     return FALSE;
   }
@@ -62,7 +62,7 @@
 }
 
 int
-gnc_module_end(int refcount)
+libgncmod_generic_import_gnc_module_end(int refcount)
 {
   return TRUE;
 }
Index: src/import-export/hbci/gncmod-hbci.c
===================================================================
--- src/import-export/hbci/gncmod-hbci.c	(revision 15920)
+++ src/import-export/hbci/gncmod-hbci.c	(working copy)
@@ -19,42 +19,42 @@
 #include "dialog-preferences.h"
 
 /* version of the gnc module system interface we require */
-int gnc_module_system_interface = 0;
+int libgncmod_hbci_gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int gnc_module_current  = 0;
-int gnc_module_revision = 0;
-int gnc_module_age      = 0;
+int libgncmod_hbci_gnc_module_current  = 0;
+int libgncmod_hbci_gnc_module_revision = 0;
+int libgncmod_hbci_gnc_module_age      = 0;
 
 
 char *
-gnc_module_path(void) {
+libgncmod_hbci_gnc_module_path(void) {
   return g_strdup("gnucash/import-export/hbci");
 }
 
 char *
-gnc_module_description(void) {
+libgncmod_hbci_gnc_module_description(void) {
   return g_strdup("Support for Online Banking protocols");
 }
 
 
 int
-gnc_module_init(int refcount)
+libgncmod_hbci_gnc_module_init(int refcount)
 {
   /* load the engine (we depend on it) */
-  if(!gnc_module_load("gnucash/engine", 0)) {
+  if(!libgncmod_hbci_gnc_module_load("gnucash/engine", 0)) {
     return FALSE;
   }
 
   /* load the app-utils (we depend on it) */
-  if(!gnc_module_load("gnucash/app-utils", 0)) {
+  if(!libgncmod_hbci_gnc_module_load("gnucash/app-utils", 0)) {
     return FALSE;
   }
-  if(!gnc_module_load("gnucash/gnome-utils", 0)) {
+  if(!libgncmod_hbci_gnc_module_load("gnucash/gnome-utils", 0)) {
     return FALSE;
   }
 
-  if(!gnc_module_load("gnucash/import-export", 0)) {
+  if(!libgncmod_hbci_gnc_module_load("gnucash/import-export", 0)) {
     return FALSE;
   }
 
@@ -71,7 +71,7 @@
 }
 
 int
-gnc_module_end(int refcount) {
+libgncmod_hbci_gnc_module_end(int refcount) {
   gnc_AB_BANKING_delete(0);
 
   /* Finalize gwen library */
Index: src/import-export/log-replay/gncmod-log-replay.c
===================================================================
--- src/import-export/log-replay/gncmod-log-replay.c	(revision 15920)
+++ src/import-export/log-replay/gncmod-log-replay.c	(working copy)
@@ -34,45 +34,45 @@
 #include "gnc-plugin-log-replay.h"
 
 /* version of the gnc module system interface we require */
-int gnc_module_system_interface = 0;
+int libgncmod_log_replay_gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int gnc_module_current  = 0;
-int gnc_module_revision = 0;
-int gnc_module_age      = 0;
+int libgncmod_log_replay_gnc_module_current  = 0;
+int libgncmod_log_replay_gnc_module_revision = 0;
+int libgncmod_log_replay_gnc_module_age      = 0;
 
 //static GNCModule bus_core;
 //static GNCModule file;
 
 
 char *
-gnc_module_path(void)
+libgncmod_log_replay_gnc_module_path(void)
 {
   return g_strdup("gnucash/import-export/log-replay");
 }
 
 char *
-gnc_module_description(void)
+libgncmod_log_replay_gnc_module_description(void)
 {
   return g_strdup("C code for log file replay");
 }
 
 int
-gnc_module_init(int refcount)
+libgncmod_log_replay_gnc_module_init(int refcount)
 {
-  if(!gnc_module_load("gnucash/engine", 0))
+  if(!libgncmod_log_replay_gnc_module_load("gnucash/engine", 0))
   {
     return FALSE;
   }
-  if(!gnc_module_load("gnucash/app-utils", 0))
+  if(!libgncmod_log_replay_gnc_module_load("gnucash/app-utils", 0))
   {
     return FALSE;
   }
-  if(!gnc_module_load("gnucash/gnome-utils", 0))
+  if(!libgncmod_log_replay_gnc_module_load("gnucash/gnome-utils", 0))
   {
     return FALSE;
   }
-    if(!gnc_module_load("gnucash/import-export", 0))
+    if(!libgncmod_log_replay_gnc_module_load("gnucash/import-export", 0))
   {
     return FALSE;
   }
@@ -84,7 +84,7 @@
 }
 
 int
-gnc_module_end(int refcount)
+libgncmod_log_replay_gnc_module_end(int refcount)
 {
   return TRUE;
 }
Index: src/test-core/gncmod-test.c
===================================================================
--- src/test-core/gncmod-test.c	(revision 15920)
+++ src/test-core/gncmod-test.c	(working copy)
@@ -12,30 +12,30 @@
 #include "gnc-module-api.h"
 
 /* version of the gnc module system interface we require */
-int gnc_module_system_interface = 0;
+int libgncmod_test_gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int gnc_module_current  = 0;
-int gnc_module_revision = 0;
-int gnc_module_age      = 0;
+int libgncmod_test_gnc_module_current  = 0;
+int libgncmod_test_gnc_module_revision = 0;
+int libgncmod_test_gnc_module_age      = 0;
 
 
 char *
-gnc_module_path(void) {
+libgncmod_test_gnc_module_path(void) {
   return g_strdup("gnucash/test");
 }
 
 char *
-gnc_module_description(void) {
+libgncmod_test_gnc_module_description(void) {
   return g_strdup("Basic GnuCash test infrastructure.");
 }
 
 int
-gnc_module_init(int refcount) {
+libgncmod_test_gnc_module_init(int refcount) {
   return TRUE;
 }
 
 int
-gnc_module_end(int refcount) {
+libgncmod_test_gnc_module_end(int refcount) {
   return TRUE;
 }
Index: src/report/utility-reports/gncmod-utility-reports.c
===================================================================
--- src/report/utility-reports/gncmod-utility-reports.c	(revision 15920)
+++ src/report/utility-reports/gncmod-utility-reports.c	(working copy)
@@ -13,28 +13,28 @@
 #include "gnc-module-api.h"
 
 /* version of the gnc module system interface we require */
-int gnc_module_system_interface = 0;
+int libgncmod_utility_reports_gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int gnc_module_current  = 0;
-int gnc_module_revision = 0;
-int gnc_module_age      = 0;
+int libgncmod_utility_reports_gnc_module_current  = 0;
+int libgncmod_utility_reports_gnc_module_revision = 0;
+int libgncmod_utility_reports_gnc_module_age      = 0;
 
 
 char *
-gnc_module_path(void) {
+libgncmod_utility_reports_gnc_module_path(void) {
   return g_strdup("gnucash/report/utility-reports");
 }
 
 char *
-gnc_module_description(void) {
+libgncmod_utility_reports_gnc_module_description(void) {
   return g_strdup("Non-financial (utility) reports");
 }
 
 int
-gnc_module_init(int refcount) {
+libgncmod_utility_reports_gnc_module_init(int refcount) {
   /* load the report system */
-  if(!gnc_module_load("gnucash/report/report-system", 0)) {
+  if(!libgncmod_utility_reports_gnc_module_load("gnucash/report/report-system", 0)) {
     return FALSE;
   }
 
@@ -48,6 +48,6 @@
 }
 
 int
-gnc_module_end(int refcount) {
+libgncmod_utility_reports_gnc_module_end(int refcount) {
   return TRUE;
 }
Index: src/report/locale-specific/us/gncmod-locale-reports-us.c
===================================================================
--- src/report/locale-specific/us/gncmod-locale-reports-us.c	(revision 15920)
+++ src/report/locale-specific/us/gncmod-locale-reports-us.c	(working copy)
@@ -13,16 +13,16 @@
 #include "gnc-module-api.h"
 
 /* version of the gnc module system interface we require */
-int gnc_module_system_interface = 0;
+int libgncmod_locale_reports_us_gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int gnc_module_current  = 0;
-int gnc_module_revision = 0;
-int gnc_module_age      = 0;
+int libgncmod_locale_reports_us_gnc_module_current  = 0;
+int libgncmod_locale_reports_us_gnc_module_revision = 0;
+int libgncmod_locale_reports_us_gnc_module_age      = 0;
 
 
 char *
-gnc_module_path(void) {
+libgncmod_locale_reports_us_gnc_module_path(void) {
   /* const char *thislocale = setlocale(LC_ALL, NULL);
   if (strncmp(thislocale, "de_DE", 5) == 0)
     return g_strdup("gnucash/report/locale-specific/de_DE");
@@ -31,12 +31,12 @@
 }
 
 char *
-gnc_module_description(void) {
+libgncmod_locale_reports_us_gnc_module_description(void) {
   return g_strdup("US income tax reports and related material");
 }
 
 int
-gnc_module_init(int refcount) {
+libgncmod_locale_reports_us_gnc_module_init(int refcount) {
   /* load the tax info */
 #ifdef LOCALE_SPECIFIC_TAX
   const char *thislocale = setlocale(LC_ALL, NULL);
@@ -59,12 +59,12 @@
 
   /* The gchar* cast is only because the function declaration expects
      a non-const string -- probably an api error. */
-  if(!gnc_module_load((gchar*)tax_module, 0)) {
+  if(!libgncmod_locale_reports_us_gnc_module_load((gchar*)tax_module, 0)) {
     return FALSE;
   }
 
   /* load the report system */
-  if(!gnc_module_load("gnucash/report/report-system", 0)) {
+  if(!libgncmod_locale_reports_us_gnc_module_load("gnucash/report/report-system", 0)) {
     return FALSE;
   }
 
@@ -85,6 +85,6 @@
 }
 
 int
-gnc_module_end(int refcount) {
+libgncmod_locale_reports_us_gnc_module_end(int refcount) {
   return TRUE;
 }
Index: src/report/standard-reports/gncmod-standard-reports.c
===================================================================
--- src/report/standard-reports/gncmod-standard-reports.c	(revision 15920)
+++ src/report/standard-reports/gncmod-standard-reports.c	(working copy)
@@ -13,28 +13,28 @@
 #include "gnc-module-api.h"
 
 /* version of the gnc module system interface we require */
-int gnc_module_system_interface = 0;
+int libgncmod_standard_reports_gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int gnc_module_current  = 0;
-int gnc_module_revision = 0;
-int gnc_module_age      = 0;
+int libgncmod_standard_reports_gnc_module_current  = 0;
+int libgncmod_standard_reports_gnc_module_revision = 0;
+int libgncmod_standard_reports_gnc_module_age      = 0;
 
 
 char *
-gnc_module_path(void) {
+libgncmod_standard_reports_gnc_module_path(void) {
   return g_strdup("gnucash/report/standard-reports");
 }
 
 char *
-gnc_module_description(void) {
+libgncmod_standard_reports_gnc_module_description(void) {
   return g_strdup("Standard income, asset, balance sheet, etc. reports");
 }
 
 int
-gnc_module_init(int refcount) {
+libgncmod_standard_reports_gnc_module_init(int refcount) {
   /* load the report system */
-  if(!gnc_module_load("gnucash/report/report-system", 0)) {
+  if(!libgncmod_standard_reports_gnc_module_load("gnucash/report/report-system", 0)) {
     return FALSE;
   }
 
@@ -47,6 +47,6 @@
 }
 
 int
-gnc_module_end(int refcount) {
+libgncmod_standard_reports_gnc_module_end(int refcount) {
   return TRUE;
 }
Index: src/report/stylesheets/gncmod-stylesheets.c
===================================================================
--- src/report/stylesheets/gncmod-stylesheets.c	(revision 15920)
+++ src/report/stylesheets/gncmod-stylesheets.c	(working copy)
@@ -15,28 +15,28 @@
 #include "gnc-plugin-stylesheets.h"
 
 /* version of the gnc module system interface we require */
-int gnc_module_system_interface = 0;
+int libgncmod_stylesheets_gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int gnc_module_current  = 0;
-int gnc_module_revision = 0;
-int gnc_module_age      = 0;
+int libgncmod_stylesheets_gnc_module_current  = 0;
+int libgncmod_stylesheets_gnc_module_revision = 0;
+int libgncmod_stylesheets_gnc_module_age      = 0;
 
 
 char *
-gnc_module_path(void) {
+libgncmod_stylesheets_gnc_module_path(void) {
   return g_strdup("gnucash/report/stylesheets");
 }
 
 char *
-gnc_module_description(void) {
+libgncmod_stylesheets_gnc_module_description(void) {
   return g_strdup("Standard report stylesheet definitions");
 }
 
 int
-gnc_module_init(int refcount) {
+libgncmod_stylesheets_gnc_module_init(int refcount) {
   /* load the report system */
-  if(!gnc_module_load("gnucash/report/report-system", 0)) {
+  if(!libgncmod_stylesheets_gnc_module_load("gnucash/report/report-system", 0)) {
     return FALSE;
   }
 
@@ -53,6 +53,6 @@
 }
 
 int
-gnc_module_end(int refcount) {
+libgncmod_stylesheets_gnc_module_end(int refcount) {
   return TRUE;
 }
Index: src/report/report-system/gncmod-report-system.c
===================================================================
--- src/report/report-system/gncmod-report-system.c	(revision 15920)
+++ src/report/report-system/gncmod-report-system.c	(working copy)
@@ -13,34 +13,34 @@
 #include "gnc-module-api.h"
 
 /* version of the gnc module system interface we require */
-int gnc_module_system_interface = 0;
+int libgncmod_report_system_gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int gnc_module_current  = 0;
-int gnc_module_revision = 0;
-int gnc_module_age      = 0;
+int libgncmod_report_system_gnc_module_current  = 0;
+int libgncmod_report_system_gnc_module_revision = 0;
+int libgncmod_report_system_gnc_module_age      = 0;
 
 
 char *
-gnc_module_path(void) {
+libgncmod_report_system_gnc_module_path(void) {
   return g_strdup("gnucash/report/report-system");
 }
 
 char *
-gnc_module_description(void) {
+libgncmod_report_system_gnc_module_description(void) {
   return g_strdup("Core components of GnuCash report generation system");
 }
 
 extern SCM scm_init_sw_report_system_module(void);
 
 int
-gnc_module_init(int refcount) {
+libgncmod_report_system_gnc_module_init(int refcount) {
   /* load the engine (we depend on it) */
-  if(!gnc_module_load("gnucash/engine", 0)) {
+  if(!libgncmod_report_system_gnc_module_load("gnucash/engine", 0)) {
     return FALSE;
   }
 
-  if(!gnc_module_load("gnucash/app-utils", 0)) {
+  if(!libgncmod_report_system_gnc_module_load("gnucash/app-utils", 0)) {
     return FALSE;
   }
   scm_init_sw_report_system_module();
@@ -57,6 +57,6 @@
 }
 
 int
-gnc_module_end(int refcount) {
+libgncmod_report_system_gnc_module_end(int refcount) {
   return TRUE;
 }
Index: src/report/report-gnome/gncmod-report-gnome.c
===================================================================
--- src/report/report-gnome/gncmod-report-gnome.c	(revision 15920)
+++ src/report/report-gnome/gncmod-report-gnome.c	(working copy)
@@ -19,22 +19,22 @@
 #include "window-report.h"
 
 /* version of the gnc module system interface we require */
-int gnc_module_system_interface = 0;
+int libgncmod_report_gnome_gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int gnc_module_current  = 0;
-int gnc_module_revision = 0;
-int gnc_module_age      = 0;
+int libgncmod_report_gnome_gnc_module_current  = 0;
+int libgncmod_report_gnome_gnc_module_revision = 0;
+int libgncmod_report_gnome_gnc_module_age      = 0;
 
 
 char *
-gnc_module_path(void)
+libgncmod_report_gnome_gnc_module_path(void)
 {
   return g_strdup("gnucash/report/report-gnome");
 }
 
 char *
-gnc_module_description(void)
+libgncmod_report_gnome_gnc_module_description(void)
 {
   return g_strdup("Gnome component of GnuCash report generation system");
 }
@@ -49,17 +49,17 @@
 extern SCM scm_init_sw_report_gnome_module(void);
 
 int
-gnc_module_init(int refcount)
+libgncmod_report_gnome_gnc_module_init(int refcount)
 {
-  if(!gnc_module_load("gnucash/app-utils", 0)) {
+  if(!libgncmod_report_gnome_gnc_module_load("gnucash/app-utils", 0)) {
     return FALSE;
   }
 
-  if(!gnc_module_load("gnucash/gnome-utils", 0)) {
+  if(!libgncmod_report_gnome_gnc_module_load("gnucash/gnome-utils", 0)) {
     return FALSE;
   }
 
-  if(!gnc_module_load("gnucash/report/report-system", 0)) {
+  if(!libgncmod_report_gnome_gnc_module_load("gnucash/report/report-system", 0)) {
     return FALSE;
   }
   scm_init_sw_report_gnome_module();
@@ -74,7 +74,7 @@
 }
 
 int
-gnc_module_end(int refcount)
+libgncmod_report_gnome_gnc_module_end(int refcount)
 {
   return TRUE;
 }
Index: src/business/business-core/gncmod-business-core.c
===================================================================
--- src/business/business-core/gncmod-business-core.c	(revision 15920)
+++ src/business/business-core/gncmod-business-core.c	(working copy)
@@ -45,31 +45,31 @@
 extern SCM scm_init_sw_business_core_module (void);
 
 /* version of the gnc module system interface we require */
-int gnc_module_system_interface = 0;
+int libgncmod_business_core_gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int gnc_module_current  = 0;
-int gnc_module_revision = 0;
-int gnc_module_age      = 0;
+int libgncmod_business_core_gnc_module_current  = 0;
+int libgncmod_business_core_gnc_module_revision = 0;
+int libgncmod_business_core_gnc_module_age      = 0;
 
 
 char *
-gnc_module_path(void)
+libgncmod_business_core_gnc_module_path(void)
 {
   return g_strdup("gnucash/business-core");
 }
 
 char *
-gnc_module_description(void)
+libgncmod_business_core_gnc_module_description(void)
 {
   return g_strdup("The GnuCash business core");
 }
 
 int
-gnc_module_init(int refcount)
+libgncmod_business_core_gnc_module_init(int refcount)
 {
   /* load the engine (we depend on it) */
-  if(!gnc_module_load("gnucash/engine", 0)) {
+  if(!libgncmod_business_core_gnc_module_load("gnucash/engine", 0)) {
     return FALSE;
   }
 
@@ -97,6 +97,6 @@
 }
 
 int
-gnc_module_end(int refcount) {
+libgncmod_business_core_gnc_module_end(int refcount) {
   return TRUE;
 }
Index: src/business/business-core/file/gncmod-business-backend-file.c
===================================================================
--- src/business/business-core/file/gncmod-business-backend-file.c	(revision 15920)
+++ src/business/business-core/file/gncmod-business-backend-file.c	(working copy)
@@ -44,35 +44,35 @@
 #include "gnc-vendor-xml-v2.h"
 
 /* version of the gnc module system interface we require */
-int gnc_module_system_interface = 0;
+int libgncmod_business_backend_file_gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int gnc_module_current  = 0;
-int gnc_module_revision = 0;
-int gnc_module_age      = 0;
+int libgncmod_business_backend_file_gnc_module_current  = 0;
+int libgncmod_business_backend_file_gnc_module_revision = 0;
+int libgncmod_business_backend_file_gnc_module_age      = 0;
 
 static GNCModule bus_core;
 static GNCModule file;
 
 
 char *
-gnc_module_path(void)
+libgncmod_business_backend_file_gnc_module_path(void)
 {
   return g_strdup("gnucash/business-core-file");
 }
 
 char *
-gnc_module_description(void)
+libgncmod_business_backend_file_gnc_module_description(void)
 {
   return g_strdup("The XML (v2) parsers for GnuCash business objects");
 }
 
 int
-gnc_module_init(int refcount)
+libgncmod_business_backend_file_gnc_module_init(int refcount)
 {
   if(!gnc_engine_is_initialized()) { return FALSE; }
 
-  bus_core = gnc_module_load("gnucash/business-core", 0);
+  bus_core = libgncmod_business_backend_file_gnc_module_load("gnucash/business-core", 0);
   if(!bus_core) return FALSE;
 
   if (refcount == 0) {
@@ -94,12 +94,12 @@
 }
 
 int
-gnc_module_end(int refcount)
+libgncmod_business_backend_file_gnc_module_end(int refcount)
 {
   int unload = TRUE;
 
   if (bus_core)
-    unload = gnc_module_unload(bus_core);
+    unload = libgncmod_business_backend_file_gnc_module_unload(bus_core);
 
   if (refcount == 0) {
     bus_core = NULL;
Index: src/business/business-utils/gncmod-business-utils.c
===================================================================
--- src/business/business-utils/gncmod-business-utils.c	(revision 15920)
+++ src/business/business-utils/gncmod-business-utils.c	(working copy)
@@ -30,36 +30,36 @@
 #include "gnc-module-api.h"
 
 /* version of the gnc module system interface we require */
-int gnc_module_system_interface = 0;
+int libgncmod_business_utils_gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int gnc_module_current  = 0;
-int gnc_module_revision = 0;
-int gnc_module_age      = 0;
+int libgncmod_business_utils_gnc_module_current  = 0;
+int libgncmod_business_utils_gnc_module_revision = 0;
+int libgncmod_business_utils_gnc_module_age      = 0;
 
 
 char *
-gnc_module_path(void)
+libgncmod_business_utils_gnc_module_path(void)
 {
   return g_strdup("gnucash/business-utils");
 }
 
 char *
-gnc_module_description(void)
+libgncmod_business_utils_gnc_module_description(void)
 {
   return g_strdup("The GnuCash business utilities module");
 }
 
 int
-gnc_module_init(int refcount)
+libgncmod_business_utils_gnc_module_init(int refcount)
 {
   /* load the business-core (we depend on it) */
-  if (!gnc_module_load("gnucash/business-core", 0)) {
+  if (!libgncmod_business_utils_gnc_module_load("gnucash/business-core", 0)) {
     return FALSE;
   }
 
   /* Load the application utils.. */
-  if (!gnc_module_load("gnucash/app-utils", 0)) {
+  if (!libgncmod_business_utils_gnc_module_load("gnucash/app-utils", 0)) {
     return FALSE;
   }
 
@@ -74,6 +74,6 @@
 }
 
 int
-gnc_module_end(int refcount) {
+libgncmod_business_utils_gnc_module_end(int refcount) {
   return TRUE;
 }
Index: src/business/business-gnome/gncmod-business-gnome.c
===================================================================
--- src/business/business-gnome/gncmod-business-gnome.c	(revision 15920)
+++ src/business/business-gnome/gncmod-business-gnome.c	(working copy)
@@ -50,47 +50,47 @@
 #include "dialog-preferences.h"
 
 /* version of the gnc module system interface we require */
-int gnc_module_system_interface = 0;
+int libgncmod_business_gnome_gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int gnc_module_current  = 0;
-int gnc_module_revision = 0;
-int gnc_module_age      = 0;
+int libgncmod_business_gnome_gnc_module_current  = 0;
+int libgncmod_business_gnome_gnc_module_revision = 0;
+int libgncmod_business_gnome_gnc_module_age      = 0;
 
 
 char *
-gnc_module_path(void)
+libgncmod_business_gnome_gnc_module_path(void)
 {
   return g_strdup("gnucash/business-gnome");
 }
 
 char *
-gnc_module_description(void)
+libgncmod_business_gnome_gnc_module_description(void)
 {
   return g_strdup("The GnuCash business module GNOME UI");
 }
 
 int
-gnc_module_init(int refcount)
+libgncmod_business_gnome_gnc_module_init(int refcount)
 {
   /* load business-core: we depend on it -- and it depends on the engine */
-  if (!gnc_module_load ("gnucash/business-core", 0)) {
+  if (!libgncmod_business_gnome_gnc_module_load ("gnucash/business-core", 0)) {
     return FALSE;
   }
   /* We also depend on app-utils, gnome-utils, and gnome-search modules */
-  if (!gnc_module_load ("gnucash/app-utils", 0)) {
+  if (!libgncmod_business_gnome_gnc_module_load ("gnucash/app-utils", 0)) {
     return FALSE;
   }
-  if (!gnc_module_load ("gnucash/gnome-utils", 0)) {
+  if (!libgncmod_business_gnome_gnc_module_load ("gnucash/gnome-utils", 0)) {
     return FALSE;
   }
-  if (!gnc_module_load ("gnucash/gnome-search", 0)) {
+  if (!libgncmod_business_gnome_gnc_module_load ("gnucash/gnome-search", 0)) {
     return FALSE;
   }
-  if (!gnc_module_load ("gnucash/report/report-gnome", 0)) {
+  if (!libgncmod_business_gnome_gnc_module_load ("gnucash/report/report-gnome", 0)) {
     return FALSE;
   }
-  //  if (!gnc_module_load ("gnucash/report/standard-reports", 0)) {
+  //  if (!libgncmod_business_gnome_gnc_module_load ("gnucash/report/standard-reports", 0)) {
   //    return FALSE;
   //  }
 
@@ -137,6 +137,6 @@
 }
 
 int
-gnc_module_end(int refcount) {
+libgncmod_business_gnome_gnc_module_end(int refcount) {
   return TRUE;
 }
Index: src/business/dialog-tax-table/gncmod-dialog-tax-table.c
===================================================================
--- src/business/dialog-tax-table/gncmod-dialog-tax-table.c	(revision 15920)
+++ src/business/dialog-tax-table/gncmod-dialog-tax-table.c	(working copy)
@@ -31,38 +31,38 @@
 
 extern SCM scm_init_sw_dialog_tax_table_module(void);
 /* version of the gnc module system interface we require */
-int gnc_module_system_interface = 0;
+int libgncmod_dialog_tax_table_gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int gnc_module_current  = 0;
-int gnc_module_revision = 0;
-int gnc_module_age      = 0;
+int libgncmod_dialog_tax_table_gnc_module_current  = 0;
+int libgncmod_dialog_tax_table_gnc_module_revision = 0;
+int libgncmod_dialog_tax_table_gnc_module_age      = 0;
 
 
 char *
-gnc_module_path(void)
+libgncmod_dialog_tax_table_gnc_module_path(void)
 {
   return g_strdup("gnucash/dialog-tax-table");
 }
 
 char *
-gnc_module_description(void)
+libgncmod_dialog_tax_table_gnc_module_description(void)
 {
   return g_strdup("The GnuCash tax-table GNOME UI module");
 }
 
 int
-gnc_module_init(int refcount)
+libgncmod_dialog_tax_table_gnc_module_init(int refcount)
 {
   /* load business-core: we depend on it -- and it depends on the engine */
-  if (!gnc_module_load ("gnucash/business-core", 0)) {
+  if (!libgncmod_dialog_tax_table_gnc_module_load ("gnucash/business-core", 0)) {
     return FALSE;
   }
   /* We also depend on app-utils and gnome-utils modules */
-  if (!gnc_module_load ("gnucash/app-utils", 0)) {
+  if (!libgncmod_dialog_tax_table_gnc_module_load ("gnucash/app-utils", 0)) {
     return FALSE;
   }
-  if (!gnc_module_load ("gnucash/gnome-utils", 0)) {
+  if (!libgncmod_dialog_tax_table_gnc_module_load ("gnucash/gnome-utils", 0)) {
     return FALSE;
   }
 
@@ -73,6 +73,6 @@
 }
 
 int
-gnc_module_end(int refcount) {
+libgncmod_dialog_tax_table_gnc_module_end(int refcount) {
   return TRUE;
 }
Index: src/tax/us/gncmod-tax-us.c
===================================================================
--- src/tax/us/gncmod-tax-us.c	(revision 15920)
+++ src/tax/us/gncmod-tax-us.c	(working copy)
@@ -13,16 +13,16 @@
 #include "gnc-module-api.h"
 
 /* version of the gnc module system interface we require */
-int gnc_module_system_interface = 0;
+int libgncmod_tax_us_gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int gnc_module_current  = 0;
-int gnc_module_revision = 0;
-int gnc_module_age      = 0;
+int libgncmod_tax_us_gnc_module_current  = 0;
+int libgncmod_tax_us_gnc_module_revision = 0;
+int libgncmod_tax_us_gnc_module_age      = 0;
 
 
 char *
-gnc_module_path(void) {
+libgncmod_tax_us_gnc_module_path(void) {
 #ifdef LOCALE_SPECIFIC_TAX
   const char *thislocale = setlocale(LC_ALL, NULL);
   if (strncmp(thislocale, "de_DE", 5) == 0)
@@ -33,7 +33,7 @@
 }
 
 char *
-gnc_module_description(void) {
+libgncmod_tax_us_gnc_module_description(void) {
   return g_strdup("US income tax information");
 }
 
@@ -46,7 +46,7 @@
 }
 
 int
-gnc_module_init(int refcount) {
+libgncmod_tax_us_gnc_module_init(int refcount) {
   /* This is a very simple hack that loads the (new, special) German
      tax definition file in a German locale, or (default) loads the
      previous US tax file. */
@@ -61,6 +61,6 @@
 }
 
 int
-gnc_module_end(int refcount) {
+libgncmod_tax_us_gnc_module_end(int refcount) {
   return TRUE;
 }
Index: src/calculation/gncmod-calculation.c
===================================================================
--- src/calculation/gncmod-calculation.c	(revision 15920)
+++ src/calculation/gncmod-calculation.c	(working copy)
@@ -12,30 +12,30 @@
 #include "gnc-module-api.h"
 
 /* version of the gnc module system interface we require */
-int gnc_module_system_interface = 0;
+int libgncmod_calculation_gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int gnc_module_current  = 0;
-int gnc_module_revision = 0;
-int gnc_module_age      = 0;
+int libgncmod_calculation_gnc_module_current  = 0;
+int libgncmod_calculation_gnc_module_revision = 0;
+int libgncmod_calculation_gnc_module_age      = 0;
 
 
 char *
-gnc_module_path(void) {
+libgncmod_calculation_gnc_module_path(void) {
   return g_strdup("gnucash/calculation");
 }
 
 char *
-gnc_module_description(void) {
+libgncmod_calculation_gnc_module_description(void) {
   return g_strdup("GnuCash calculation module");
 }
 
 int
-gnc_module_init(int refcount) {
+libgncmod_calculation_gnc_module_init(int refcount) {
   return TRUE;
 }
 
 int
-gnc_module_end(int refcount) {
+libgncmod_calculation_gnc_module_end(int refcount) {
   return TRUE;
 }
Index: src/gnome-utils/gncmod-gnome-utils.c
===================================================================
--- src/gnome-utils/gncmod-gnome-utils.c	(revision 15920)
+++ src/gnome-utils/gncmod-gnome-utils.c	(working copy)
@@ -24,21 +24,21 @@
 #include "gnc-druid-provider-multifile-gnome.h"
 
 /* version of the gnc module system interface we require */
-int gnc_module_system_interface = 0;
+int libgncmod_gnome_utils_gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int gnc_module_current  = 0;
-int gnc_module_revision = 0;
-int gnc_module_age      = 0;
+int libgncmod_gnome_utils_gnc_module_current  = 0;
+int libgncmod_gnome_utils_gnc_module_revision = 0;
+int libgncmod_gnome_utils_gnc_module_age      = 0;
 
 
 char *
-gnc_module_path(void) {
+libgncmod_gnome_utils_gnc_module_path(void) {
   return g_strdup("gnucash/gnome-utils");
 }
 
 char *
-gnc_module_description(void) {
+libgncmod_gnome_utils_gnc_module_description(void) {
   return g_strdup("Utilities for using Gnome/Gtk with GnuCash");
 }
 
@@ -53,18 +53,18 @@
 extern SCM scm_init_sw_gnome_utils_module(void);
 
 int
-gnc_module_init(int refcount) {
+libgncmod_gnome_utils_gnc_module_init(int refcount) {
   /* load the engine (we depend on it) */
-  if(!gnc_module_load("gnucash/engine", 0)) {
+  if(!libgncmod_gnome_utils_gnc_module_load("gnucash/engine", 0)) {
     return FALSE;
   }
 
   /* load the calculation module (we depend on it) */
-  if(!gnc_module_load("gnucash/calculation", 0)) {
+  if(!libgncmod_gnome_utils_gnc_module_load("gnucash/calculation", 0)) {
     return FALSE;
   }
 
-  if(!gnc_module_load("gnucash/app-utils", 0)) {
+  if(!libgncmod_gnome_utils_gnc_module_load("gnucash/app-utils", 0)) {
     return FALSE;
   }
 
@@ -88,7 +88,7 @@
 }
 
 int
-gnc_module_end(int refcount)
+libgncmod_gnome_utils_gnc_module_end(int refcount)
 {
   return TRUE;
 }
Index: src/engine/gncmod-engine.c
===================================================================
--- src/engine/gncmod-engine.c	(revision 15920)
+++ src/engine/gncmod-engine.c	(working copy)
@@ -13,22 +13,22 @@
 #include "gnc-module-api.h"
 
 /* version of the gnc module system interface we require */
-int gnc_module_system_interface = 0;
+int libgncmod_engine_gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int gnc_module_current  = 0;
-int gnc_module_revision = 0;
-int gnc_module_age      = 0;
+int libgncmod_engine_gnc_module_current  = 0;
+int libgncmod_engine_gnc_module_revision = 0;
+int libgncmod_engine_gnc_module_age      = 0;
 
 
 char *
-gnc_module_path(void)
+libgncmod_engine_gnc_module_path(void)
 {
   return g_strdup("gnucash/engine");
 }
 
 char *
-gnc_module_description(void)
+libgncmod_engine_gnc_module_description(void)
 {
   return g_strdup("The GnuCash accounting engine");
 }
@@ -36,7 +36,7 @@
 extern SCM scm_init_sw_engine_module(void);
 
 int
-gnc_module_init(int refcount)
+libgncmod_engine_gnc_module_init(int refcount)
 {
   if(refcount == 0)
   {
@@ -52,6 +52,6 @@
 }
 
 int
-gnc_module_end(int refcount) {
+libgncmod_engine_gnc_module_end(int refcount) {
   return TRUE;
 }
Index: src/engine/test-core/gncmod-test-engine.c
===================================================================
--- src/engine/test-core/gncmod-test-engine.c	(revision 15920)
+++ src/engine/test-core/gncmod-test-engine.c	(working copy)
@@ -12,30 +12,30 @@
 #include "gnc-module-api.h"
 
 /* version of the gnc module system interface we require */
-int gnc_module_system_interface = 0;
+int libgncmod_test_engine_gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int gnc_module_current  = 0;
-int gnc_module_revision = 0;
-int gnc_module_age      = 0;
+int libgncmod_test_engine_gnc_module_current  = 0;
+int libgncmod_test_engine_gnc_module_revision = 0;
+int libgncmod_test_engine_gnc_module_age      = 0;
 
 
 char *
-gnc_module_path(void) {
+libgncmod_test_engine_gnc_module_path(void) {
   return g_strdup("gnucash/engine/test");
 }
 
 char *
-gnc_module_description(void) {
+libgncmod_test_engine_gnc_module_description(void) {
   return g_strdup("GnuCash Engine test infrastructure.");
 }
 
 int
-gnc_module_init(int refcount) {
+libgncmod_test_engine_gnc_module_init(int refcount) {
   return TRUE;
 }
 
 int
-gnc_module_end(int refcount) {
+libgncmod_test_engine_gnc_module_end(int refcount) {
   return TRUE;
 }
Index: src/gnome-search/gncmod-gnome-search.c
===================================================================
--- src/gnome-search/gncmod-gnome-search.c	(revision 15920)
+++ src/gnome-search/gncmod-gnome-search.c	(working copy)
@@ -36,35 +36,35 @@
 #include "search-core-type.h"
 
 /* version of the gnc module system interface we require */
-int gnc_module_system_interface = 0;
+int libgncmod_gnome_search_gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int gnc_module_current  = 0;
-int gnc_module_revision = 0;
-int gnc_module_age      = 0;
+int libgncmod_gnome_search_gnc_module_current  = 0;
+int libgncmod_gnome_search_gnc_module_revision = 0;
+int libgncmod_gnome_search_gnc_module_age      = 0;
 
 
 char *
-gnc_module_path(void)
+libgncmod_gnome_search_gnc_module_path(void)
 {
   return g_strdup("gnucash/gnome-search");
 }
 
 char *
-gnc_module_description(void)
+libgncmod_gnome_search_gnc_module_description(void)
 {
   return g_strdup("The GnuCash Gnome Search UI");
 }
 
 int
-gnc_module_init(int refcount)
+libgncmod_gnome_search_gnc_module_init(int refcount)
 {
   /* load the engine (we depend on it) */
-  if(!gnc_module_load("gnucash/engine", 0)) {
+  if(!libgncmod_gnome_search_gnc_module_load("gnucash/engine", 0)) {
     return FALSE;
   }
 
-  if (!gnc_module_load("gnucash/gnome-utils", 0)) {
+  if (!libgncmod_gnome_search_gnc_module_load("gnucash/gnome-utils", 0)) {
     return FALSE;
   }
 
@@ -78,7 +78,7 @@
 }
 
 int
-gnc_module_end(int refcount) {
+libgncmod_gnome_search_gnc_module_end(int refcount) {
   /* XXX Unload the other modules */
 
   if (refcount == 0) {
Index: src/app-utils/gncmod-app-utils.c
===================================================================
--- src/app-utils/gncmod-app-utils.c	(revision 15920)
+++ src/app-utils/gncmod-app-utils.c	(working copy)
@@ -17,21 +17,21 @@
 #include "gnc-exp-parser.h"
 
 /* version of the gnc module system interface we require */
-int gnc_module_system_interface = 0;
+int libgncmod_app_utils_gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int gnc_module_current  = 0;
-int gnc_module_revision = 0;
-int gnc_module_age      = 0;
+int libgncmod_app_utils_gnc_module_current  = 0;
+int libgncmod_app_utils_gnc_module_revision = 0;
+int libgncmod_app_utils_gnc_module_age      = 0;
 
 
 char *
-gnc_module_path(void) {
+libgncmod_app_utils_gnc_module_path(void) {
   return g_strdup("gnucash/app-utils");
 }
 
 char *
-gnc_module_description(void) {
+libgncmod_app_utils_gnc_module_description(void) {
   return g_strdup("Utilities for building gnc applications");
 }
 
@@ -54,15 +54,15 @@
 extern SCM scm_init_sw_app_utils_module(void);
 
 int
-gnc_module_init(int refcount)
+libgncmod_app_utils_gnc_module_init(int refcount)
 {
   /* load the engine (we depend on it) */
-  if(!gnc_module_load("gnucash/engine", 0)) {
+  if(!libgncmod_app_utils_gnc_module_load("gnucash/engine", 0)) {
     return FALSE;
   }
 
   /* load the calculation module (we depend on it) */
-  if(!gnc_module_load("gnucash/calculation", 0)) {
+  if(!libgncmod_app_utils_gnc_module_load("gnucash/calculation", 0)) {
     return FALSE;
   }
 
@@ -82,7 +82,7 @@
 }
 
 int
-gnc_module_end(int refcount)
+libgncmod_app_utils_gnc_module_end(int refcount)
 {
   if (refcount == 0)
     gnc_component_manager_shutdown ();