diff --git a/bindings/business-core.i b/bindings/business-core.i
index 81ae0552ec..d4862251b2 100644
--- a/bindings/business-core.i
+++ b/bindings/business-core.i
@@ -126,7 +126,7 @@ GLIST_HELPER_INOUT(OwnerList, SWIGTYPE_p__gncOwner);
 %include <gncTaxTable.h>
 %include <gncVendor.h>
 #if defined(SWIGGUILE)
-%include <engine-helpers-guile.h>
+%include <gnc-engine-guile.h>
 #endif
 /* Import query bindings for the below invoice query functions (but
  * don't generate bindings for them). */
diff --git a/bindings/engine.i b/bindings/engine.i
index c19f46c68a..84e80e2db6 100644
--- a/bindings/engine.i
+++ b/bindings/engine.i
@@ -35,11 +35,11 @@
 #include "gnc-session.h"
 #include "engine-deprecated.h"
 #include "engine-helpers.h"
-#include "engine-helpers-guile.h"
+#include "gnc-engine-guile.h"
 #include "policy.h"
 #include "SX-book.h"
-#include "kvp-scm.h"
-#include "glib-helpers.h"
+#include "gnc-kvm-guile.h"
+#include "glib-guile.h"
 
 #include "gncAddress.h"
 #include "gncBillTerm.h"
@@ -174,7 +174,7 @@ functions. */
 }
 
 %include <engine-helpers.h>
-%include <engine-helpers-guile.h>
+%include <gnc-engine-guile.h>
 %typemap(in) Transaction *trans;
 %typemap(in) Split *split;
 %typemap(in) char * num;
diff --git a/bindings/guile/CMakeLists.txt b/bindings/guile/CMakeLists.txt
index cdd83d21fd..3810a423d4 100644
--- a/bindings/guile/CMakeLists.txt
+++ b/bindings/guile/CMakeLists.txt
@@ -21,17 +21,17 @@ gnc_add_swig_guile_command (swig-engine-c
 )
 
 set(guile_HEADERS
-    engine-helpers-guile.h
-    glib-helpers.h
+    glib-guile.h
+    gnc-engine-guile.h
     gnc-guile-utils.h
-    kvp-scm.h)
+    gnc-kvp-guile.h)
 
 set(guile_SOURCES
-    engine-helpers-guile.c
-    glib-helpers.c
+    glib-guile.c
+    gnc-engine-guile.c
     gnc-guile-bindings.c
     gnc-guile-utils.c
-    kvp-scm.cpp)
+    gnc-kvp-guile.cpp)
 
 add_library(gnucash-guile SHARED
     ${guile_SOURCES}
diff --git a/bindings/guile/glib-helpers.c b/bindings/guile/glib-guile.c
similarity index 98%
rename from bindings/guile/glib-helpers.c
rename to bindings/guile/glib-guile.c
index 9651c6f097..943494cbcf 100644
--- a/bindings/guile/glib-helpers.c
+++ b/bindings/guile/glib-guile.c
@@ -1,5 +1,5 @@
 /********************************************************************\
- * gnc-helpers.c -- gnucash glib helper functions                   *
+ * glib-guile.c -- glib helper functions for guile                  *
  * Copyright (C) 2000 Linas Vepstas                                 *
  * Copyright (C) 2006 Chris Shoemaker <c.shoemaker@cox.net>         *
  *                                                                  *
@@ -30,7 +30,7 @@
 #include "swig-runtime.h"
 #include "guile-mappings.h"
 #include "gnc-guile-utils.h"
-#include "glib-helpers.h"
+#include "glib-guile.h"
 
 
 static SCM
diff --git a/bindings/guile/glib-helpers.h b/bindings/guile/glib-guile.h
similarity index 94%
rename from bindings/guile/glib-helpers.h
rename to bindings/guile/glib-guile.h
index 1ac8ba85f8..f2f69f194c 100644
--- a/bindings/guile/glib-helpers.h
+++ b/bindings/guile/glib-guile.h
@@ -1,5 +1,5 @@
 /********************************************************************\
- * glib-helpers.h -- gnucash glib helper functions                  *
+ * glib-guile.h -- glib helper functions for guile                  *
  * Copyright (C) 2000 Linas Vepstas                                 *
  * Copyright (C) 2006 Chris Shoemaker <c.shoemaker@cox.net>         *
  *                                                                  *
@@ -22,8 +22,8 @@
  *                                                                  *
 \********************************************************************/
 
-#ifndef GLIB_HELPERS_H
-#define GLIB_HELPERS_H
+#ifndef GLIB_GUILE_H
+#define GLIB_GUILE_H
 
 #include <glib.h>
 #include <libguile.h>
diff --git a/bindings/guile/engine-helpers-guile.c b/bindings/guile/gnc-engine-guile.c
similarity index 99%
rename from bindings/guile/engine-helpers-guile.c
rename to bindings/guile/gnc-engine-guile.c
index f9ee527089..c047fa6d47 100644
--- a/bindings/guile/engine-helpers-guile.c
+++ b/bindings/guile/gnc-engine-guile.c
@@ -1,5 +1,5 @@
 /********************************************************************\
- * engine-helpers-guile.c -- engine helper functions for guile      *
+ * gnc-engine-guile.c -- engine helper functions for guile          *
  * Copyright (C) 2000 Linas Vepstas <linas@linas.org>               *
  * Copyright (C) 2001 Linux Developers Group, Inc.                  *
  *                                                                  *
@@ -30,8 +30,8 @@
 
 #include "Account.h"
 #include "engine-helpers.h"
-#include "engine-helpers-guile.h"
-#include "glib-helpers.h"
+#include "gnc-engine-guile.h"
+#include "glib-guile.h"
 #include "gnc-date.h"
 #include "gnc-engine.h"
 #include "gnc-session.h"
diff --git a/bindings/guile/engine-helpers-guile.h b/bindings/guile/gnc-engine-guile.h
similarity index 95%
rename from bindings/guile/engine-helpers-guile.h
rename to bindings/guile/gnc-engine-guile.h
index ff3e4edab1..3f73972197 100644
--- a/bindings/guile/engine-helpers-guile.h
+++ b/bindings/guile/gnc-engine-guile.h
@@ -1,5 +1,5 @@
 /********************************************************************\
- * engine-helpers-guile.h -- engine helper functions for guile      *
+ * gnc-engine-guile.h -- engine helper functions for guile          *
  * Copyright (C) 2000 Linas Vepstas <linas@linas.org>               *
  * Copyright (C) 2001 Linux Developers Group, Inc.                  *
  *                                                                  *
@@ -22,8 +22,8 @@
  *                                                                  *
 \********************************************************************/
 
-#ifndef ENGINE_HELPERS_GUILE_H
-#define ENGINE_HELPERS_GUILE_H
+#ifndef GNC_ENGINE_GUILE_H
+#define GNC_ENGINE_GUILE_H
 
 #include <glib.h>
 #include <libguile.h>
diff --git a/bindings/guile/kvp-scm.cpp b/bindings/guile/gnc-kvp-guile.cpp
similarity index 98%
rename from bindings/guile/kvp-scm.cpp
rename to bindings/guile/gnc-kvp-guile.cpp
index 79d76372ce..7a212b6af9 100644
--- a/bindings/guile/kvp-scm.cpp
+++ b/bindings/guile/gnc-kvp-guile.cpp
@@ -9,9 +9,9 @@ extern "C"
 #include <qof.h>
 #include "swig-runtime.h"
 #include "guile-mappings.h"
-#include "engine-helpers-guile.h"
+#include "gnc-engine-guile.h"
 #include "gnc-guile-utils.h"
-#include "kvp-scm.h"
+#include "gnc-kvm-guile.h"
 }
 
 /* NOTE: There are some problems with this approach. Currently,
diff --git a/bindings/guile/kvp-scm.h b/bindings/guile/gnc-kvp-guile.h
similarity index 100%
rename from bindings/guile/kvp-scm.h
rename to bindings/guile/gnc-kvp-guile.h
diff --git a/libgnucash/engine/test/test-scm-query.cpp b/bindings/guile/test/test-scm-query.cpp
similarity index 98%
rename from libgnucash/engine/test/test-scm-query.cpp
rename to bindings/guile/test/test-scm-query.cpp
index 9688241911..90f0926237 100644
--- a/libgnucash/engine/test/test-scm-query.cpp
+++ b/bindings/guile/test/test-scm-query.cpp
@@ -25,7 +25,7 @@ extern "C"
 #include <config.h>
 #include <glib.h>
 
-#include "engine-helpers-guile.h"
+#include "gnc-engine-guile.h"
 #include "gnc-module.h"
 #include "test-engine-stuff.h"
 #include "test-stuff.h"
diff --git a/gnucash/gnome-utils/dialog-options.c b/gnucash/gnome-utils/dialog-options.c
index 9227e9056f..cb16e15a58 100644
--- a/gnucash/gnome-utils/dialog-options.c
+++ b/gnucash/gnome-utils/dialog-options.c
@@ -34,8 +34,8 @@
 
 #include "dialog-options.h"
 #include "dialog-utils.h"
-#include "engine-helpers-guile.h"
-#include "glib-helpers.h"
+#include "gnc-engine-guile.h"
+#include "glib-guile.h"
 #include "gnc-account-sel.h"
 #include "gnc-tree-view-account.h"
 #include "gnc-tree-model-account.h"
diff --git a/gnucash/gnome-utils/dialog-transfer.c b/gnucash/gnome-utils/dialog-transfer.c
index 786b537ada..86edbd98fa 100644
--- a/gnucash/gnome-utils/dialog-transfer.c
+++ b/gnucash/gnome-utils/dialog-transfer.c
@@ -47,7 +47,7 @@
 #include "swig-runtime.h"
 #include "guile-mappings.h"
 #include "engine-helpers.h"
-#include "engine-helpers-guile.h"
+#include "gnc-engine-guile.h"
 #include "QuickFill.h"
 #include <gnc-commodity.h>
 
diff --git a/gnucash/gnome/dialog-price-edit-db.c b/gnucash/gnome/dialog-price-edit-db.c
index d6ce1d1b82..7f64d16731 100644
--- a/gnucash/gnome/dialog-price-edit-db.c
+++ b/gnucash/gnome/dialog-price-edit-db.c
@@ -49,7 +49,7 @@
 #include "swig-runtime.h"
 #include "guile-mappings.h"
 #include "guile-util.h"
-#include "engine-helpers-guile.h"
+#include "gnc-engine-guile.h"
 
 
 #define DIALOG_PRICE_DB_CM_CLASS "dialog-price-edit-db"
diff --git a/gnucash/gnucash-bin.c b/gnucash/gnucash-bin.c
index 8e687e90cf..f9b0614a31 100644
--- a/gnucash/gnucash-bin.c
+++ b/gnucash/gnucash-bin.c
@@ -54,7 +54,7 @@
 #include "gnc-plugin-report-system.h"
 #include "dialog-new-user.h"
 #include "gnc-session.h"
-#include "engine-helpers-guile.h"
+#include "gnc-engine-guile.h"
 #include "swig-runtime.h"
 #include "guile-mappings.h"
 #include "window-report.h"
diff --git a/libgnucash/app-utils/app-utils.i b/libgnucash/app-utils/app-utils.i
index d09b4ee10c..583b8e90e8 100644
--- a/libgnucash/app-utils/app-utils.i
+++ b/libgnucash/app-utils/app-utils.i
@@ -35,7 +35,7 @@
 #include <guile-util.h>
 #include <gnc-sx-instance-model.h>
 
-#include "engine-helpers-guile.h"
+#include "gnc-engine-guile.h"
 %}
 
 #if defined(SWIGGUILE)
diff --git a/libgnucash/app-utils/gnc-helpers.c b/libgnucash/app-utils/gnc-helpers.c
index 302f32cf34..b1db736836 100644
--- a/libgnucash/app-utils/gnc-helpers.c
+++ b/libgnucash/app-utils/gnc-helpers.c
@@ -29,7 +29,7 @@
 #include "guile-mappings.h"
 
 #include "gnc-engine.h"
-#include "engine-helpers-guile.h"
+#include "gnc-engine-guile.h"
 #include "gnc-helpers.h"
 #include "gnc-ui-util.h"
 
diff --git a/libgnucash/app-utils/guile-util.c b/libgnucash/app-utils/guile-util.c
index 8b0a955834..10edb67301 100644
--- a/libgnucash/app-utils/guile-util.c
+++ b/libgnucash/app-utils/guile-util.c
@@ -50,8 +50,8 @@
 #endif
 
 #include "qof.h"
-#include "engine-helpers-guile.h"
-#include "glib-helpers.h"
+#include "gnc-engine-guile.h"
+#include "glib-guile.h"
 #include "gnc-glib-utils.h"
 #include "gnc-guile-utils.h"
 #include "gnc-prefs.h"
diff --git a/libgnucash/app-utils/option-util.c b/libgnucash/app-utils/option-util.c
index 3daf522ebb..639cb212f3 100644
--- a/libgnucash/app-utils/option-util.c
+++ b/libgnucash/app-utils/option-util.c
@@ -29,7 +29,7 @@
 
 #include "Account.h"
 #include "option-util.h"
-#include "glib-helpers.h"
+#include "glib-guile.h"
 #include "gnc-guile-utils.h"
 #include "qof.h"
 #include "swig-runtime.h"
diff --git a/libgnucash/app-utils/option-util.h b/libgnucash/app-utils/option-util.h
index d35692c647..40de7b8a46 100644
--- a/libgnucash/app-utils/option-util.h
+++ b/libgnucash/app-utils/option-util.h
@@ -30,7 +30,7 @@
 #include "guile-mappings.h"
 
 #include "gnc-commodity.h"
-#include "engine-helpers-guile.h"
+#include "gnc-engine-guile.h"
 #include "qof.h"
 
 typedef struct gnc_option GNCOption;
diff --git a/libgnucash/app-utils/test/test-print-queries.cpp b/libgnucash/app-utils/test/test-print-queries.cpp
index 9457651f2e..b541deb171 100644
--- a/libgnucash/app-utils/test/test-print-queries.cpp
+++ b/libgnucash/app-utils/test/test-print-queries.cpp
@@ -26,7 +26,7 @@ extern "C"
 #include <glib.h>
 #include "guile-mappings.h"
 
-#include "engine-helpers-guile.h"
+#include "gnc-engine-guile.h"
 #include "gnc-module.h"
 #include "test-engine-stuff.h"
 #include "test-stuff.h"
diff --git a/libgnucash/app-utils/test/test-scm-query-string.cpp b/libgnucash/app-utils/test/test-scm-query-string.cpp
index e7d381641f..7772875bb8 100644
--- a/libgnucash/app-utils/test/test-scm-query-string.cpp
+++ b/libgnucash/app-utils/test/test-scm-query-string.cpp
@@ -26,7 +26,7 @@ extern "C"
 #include <glib.h>
 #include "guile-mappings.h"
 
-#include "engine-helpers-guile.h"
+#include "gnc-engine-guile.h"
 #include "gnc-module.h"
 #include "gnc-guile-utils.h"
 #include "test-engine-stuff.h"
diff --git a/libgnucash/engine/test/CMakeLists.txt b/libgnucash/engine/test/CMakeLists.txt
index a9445c3482..867adceafd 100644
--- a/libgnucash/engine/test/CMakeLists.txt
+++ b/libgnucash/engine/test/CMakeLists.txt
@@ -6,7 +6,7 @@ set(ENGINE_TEST_INCLUDE_DIRS
   ${CMAKE_SOURCE_DIR}/libgnucash/engine/test-core
   ${CMAKE_BINARY_DIR}/common # for config.h
   ${CMAKE_SOURCE_DIR}/common/test-core  # for unittest-support.h
-  ${CMAKE_SOURCE_DIR}/bindings/guile # for engine-helpers-guile.h
+  ${CMAKE_SOURCE_DIR}/bindings/guile # for gnc-engine-guile.h
   ${GLIB2_INCLUDE_DIRS}
 )
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5a22d255ef..3134ba0bbc 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,14 +3,14 @@
 bindings/guile/business-core.scm
 bindings/guile/commodity-table.scm
 bindings/guile/core-utils.scm
-bindings/guile/engine-helpers-guile.c
 bindings/guile/engine.scm
 bindings/guile/engine-utilities.scm
-bindings/guile/glib-helpers.c
+bindings/guile/glib-guile.c
+bindings/guile/gnc-engine-guile.c
 bindings/guile/gnc-guile-bindings.c
 bindings/guile/gnc-guile-utils.c
+bindings/guile/gnc-kvp-guile.cpp
 bindings/guile/gnc-numeric.scm
-bindings/guile/kvp-scm.cpp
 bindings/guile/price-quotes.scm
 bindings/guile/utilities.scm
 borrowed/goffice/go-charmap-sel.c