diff --git a/gnucash/gnome/CMakeLists.txt b/gnucash/gnome/CMakeLists.txt
index 01cdc055c9..0d29dec9de 100644
--- a/gnucash/gnome/CMakeLists.txt
+++ b/gnucash/gnome/CMakeLists.txt
@@ -7,6 +7,7 @@ set (gnc_gnome_noinst_HEADERS
   business-options-gnome.h
   business-urls.h
   business-gnome-utils.h
+  dialog-assoc.h
   dialog-billterms.h
   dialog-choose-owner.h
   dialog-customer.h
@@ -32,7 +33,6 @@ set (gnc_gnome_noinst_HEADERS
   dialog-sx-editor2.h
   dialog-sx-from-trans.h
   dialog-sx-since-last-run.h
-  dialog-trans-assoc.h
   dialog-vendor.h
   gnc-budget-view.h
   gnc-plugin-account-tree.h
@@ -75,6 +75,7 @@ set (gnc_gnome_SOURCES
   business-options-gnome.c
   business-urls.c
   business-gnome-utils.c
+  dialog-assoc.c
   dialog-billterms.c
   dialog-choose-owner.c
   dialog-commodities.c
@@ -104,7 +105,6 @@ set (gnc_gnome_SOURCES
   dialog-sx-from-trans.c
   dialog-sx-since-last-run.c
   dialog-tax-info.c
-  dialog-trans-assoc.c
   dialog-vendor.c
   gnc-budget-view.c
   gnc-plugin-account-tree.c
diff --git a/gnucash/gnome/dialog-trans-assoc.c b/gnucash/gnome/dialog-assoc.c
similarity index 99%
rename from gnucash/gnome/dialog-trans-assoc.c
rename to gnucash/gnome/dialog-assoc.c
index 2af97f5162..72a5397474 100644
--- a/gnucash/gnome/dialog-trans-assoc.c
+++ b/gnucash/gnome/dialog-assoc.c
@@ -25,7 +25,7 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
-#include "dialog-trans-assoc.h"
+#include "dialog-assoc.h"
 
 #include "dialog-utils.h"
 #include "gnc-component-manager.h"
@@ -470,8 +470,8 @@ gnc_assoc_dialog_create (GtkWindow *parent, AssocDialog *assoc_dialog)
 
     ENTER(" ");
     builder = gtk_builder_new();
-    gnc_builder_add_from_file (builder, "dialog-trans-assoc.glade", "list-store");
-    gnc_builder_add_from_file (builder, "dialog-trans-assoc.glade", "transaction_association_window");
+    gnc_builder_add_from_file (builder, "dialog-assoc.glade", "list-store");
+    gnc_builder_add_from_file (builder, "dialog-assoc.glade", "transaction_association_window");
 
     window = GTK_WIDGET(gtk_builder_get_object (builder, "transaction_association_window"));
     assoc_dialog->window = window;
diff --git a/gnucash/gnome/dialog-trans-assoc.h b/gnucash/gnome/dialog-assoc.h
similarity index 100%
rename from gnucash/gnome/dialog-trans-assoc.h
rename to gnucash/gnome/dialog-assoc.h
diff --git a/gnucash/gnome/gnc-plugin-basic-commands.c b/gnucash/gnome/gnc-plugin-basic-commands.c
index 4deddcfe76..d9b8c80969 100644
--- a/gnucash/gnome/gnc-plugin-basic-commands.c
+++ b/gnucash/gnome/gnc-plugin-basic-commands.c
@@ -39,6 +39,7 @@
 #include "gnc-plugin-basic-commands.h"
 #include "gnc-ui-util.h"
 
+#include "dialog-assoc.h"
 #include "dialog-book-close.h"
 #include "dialog-file-access.h"
 #include "dialog-fincalc.h"
@@ -47,7 +48,6 @@
 #include "dialog-imap-editor.h"
 #include "dialog-sx-since-last-run.h"
 #include "dialog-totd.h"
-#include "dialog-trans-assoc.h"
 #include "assistant-acct-period.h"
 #include "assistant-loan.h"
 #include "gnc-engine.h"
diff --git a/gnucash/gtkbuilder/CMakeLists.txt b/gnucash/gtkbuilder/CMakeLists.txt
index 83d17dce16..38d9a39b59 100644
--- a/gnucash/gtkbuilder/CMakeLists.txt
+++ b/gnucash/gtkbuilder/CMakeLists.txt
@@ -13,6 +13,7 @@ set (gtkbuilder_SOURCES
         business-prefs.glade
         dialog-account-picker.glade
         dialog-account.glade
+        dialog-assoc.glade
         dialog-bi-import-gui.glade
         dialog-billterms.glade
         dialog-book-close.glade
@@ -49,7 +50,6 @@ set (gtkbuilder_SOURCES
         dialog-tax-info.glade
         dialog-tax-table.glade
         dialog-totd.glade
-        dialog-trans-assoc.glade
         dialog-transfer.glade
         dialog-userpass.glade
         dialog-vendor.glade
diff --git a/gnucash/gtkbuilder/dialog-trans-assoc.glade b/gnucash/gtkbuilder/dialog-assoc.glade
similarity index 100%
rename from gnucash/gtkbuilder/dialog-trans-assoc.glade
rename to gnucash/gtkbuilder/dialog-assoc.glade
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 492b7dd484..2306930f0e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -53,6 +53,7 @@ gnucash/gnome/assistant-stock-split.c
 gnucash/gnome/business-gnome-utils.c
 gnucash/gnome/business-options-gnome.c
 gnucash/gnome/business-urls.c
+gnucash/gnome/dialog-assoc.c
 gnucash/gnome/dialog-billterms.c
 gnucash/gnome/dialog-choose-owner.c
 gnucash/gnome/dialog-commodities.c
@@ -82,7 +83,6 @@ gnucash/gnome/dialog-sx-editor.c
 gnucash/gnome/dialog-sx-from-trans.c
 gnucash/gnome/dialog-sx-since-last-run.c
 gnucash/gnome/dialog-tax-info.c
-gnucash/gnome/dialog-trans-assoc.c
 gnucash/gnome/dialog-vendor.c
 gnucash/gnome/gnc-budget-view.c
 gnucash/gnome/gnc-plugin-account-tree.c
@@ -241,6 +241,7 @@ gnucash/gtkbuilder/business-options-gnome.glade
 gnucash/gtkbuilder/business-prefs.glade
 gnucash/gtkbuilder/dialog-account.glade
 gnucash/gtkbuilder/dialog-account-picker.glade
+gnucash/gtkbuilder/dialog-assoc.glade
 gnucash/gtkbuilder/dialog-bi-import-gui.glade
 gnucash/gtkbuilder/dialog-billterms.glade
 gnucash/gtkbuilder/dialog-book-close.glade
@@ -277,7 +278,6 @@ gnucash/gtkbuilder/dialog-sx.glade
 gnucash/gtkbuilder/dialog-tax-info.glade
 gnucash/gtkbuilder/dialog-tax-table.glade
 gnucash/gtkbuilder/dialog-totd.glade
-gnucash/gtkbuilder/dialog-trans-assoc.glade
 gnucash/gtkbuilder/dialog-transfer.glade
 gnucash/gtkbuilder/dialog-userpass.glade
 gnucash/gtkbuilder/dialog-vendor.glade