diff --git a/src/gnome/dialog-commodities.c b/src/gnome/dialog-commodities.c
index d5364f9ca5..26bc867de0 100644
--- a/src/gnome/dialog-commodities.c
+++ b/src/gnome/dialog-commodities.c
@@ -315,7 +315,7 @@ gnc_commodities_dialog_create (GtkWidget * parent, CommoditiesDialog *cd)
     GtkTreeSelection *selection;
 
     builder = gtk_builder_new();
-    gnc_builder_add_from_file (builder, "commodities.glade", "Securities Dialog");
+    gnc_builder_add_from_file (builder, "dialog-commodities.glade", "Securities Dialog");
 
     cd->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Securities Dialog"));
     cd->session = gnc_get_current_session();
diff --git a/src/gnome/dialog-fincalc.c b/src/gnome/dialog-fincalc.c
index b5eadf7942..f49d3093f2 100644
--- a/src/gnome/dialog-fincalc.c
+++ b/src/gnome/dialog-fincalc.c
@@ -566,9 +566,9 @@ gnc_ui_fincalc_dialog_create(void)
     fcd = g_new0(FinCalcDialog, 1);
 
     builder = gtk_builder_new();
-    gnc_builder_add_from_file (builder, "fincalc.glade", "liststore1");
-    gnc_builder_add_from_file (builder, "fincalc.glade", "liststore2");
-    gnc_builder_add_from_file (builder, "fincalc.glade", "Financial Calculator Dialog");
+    gnc_builder_add_from_file (builder, "dialog-fincalc.glade", "liststore1");
+    gnc_builder_add_from_file (builder, "dialog-fincalc.glade", "liststore2");
+    gnc_builder_add_from_file (builder, "dialog-fincalc.glade", "Financial Calculator Dialog");
 
     fcd->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Financial Calculator Dialog"));
 
diff --git a/src/gnome/dialog-price-edit-db.c b/src/gnome/dialog-price-edit-db.c
index 76efee0187..d5f4d4a23c 100644
--- a/src/gnome/dialog-price-edit-db.c
+++ b/src/gnome/dialog-price-edit-db.c
@@ -225,7 +225,7 @@ gnc_prices_dialog_remove_old_clicked (GtkWidget *widget, gpointer data)
 
     ENTER(" ");
     builder = gtk_builder_new();
-    gnc_builder_add_from_file (builder, "price.glade", "Deletion Date");
+    gnc_builder_add_from_file (builder, "dialog-price.glade", "Deletion Date");
 
     dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Deletion Date"));
 
@@ -423,7 +423,7 @@ gnc_prices_dialog_create (GtkWidget * parent, PricesDialog *pdb_dialog)
 
     ENTER(" ");
     builder = gtk_builder_new();
-    gnc_builder_add_from_file (builder, "price.glade", "Prices Dialog");
+    gnc_builder_add_from_file (builder, "dialog-price.glade", "Prices Dialog");
 
     dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Prices Dialog"));
     pdb_dialog->dialog = dialog;
diff --git a/src/gnome/dialog-price-editor.c b/src/gnome/dialog-price-editor.c
index b11a17c457..cbea7e94ea 100644
--- a/src/gnome/dialog-price-editor.c
+++ b/src/gnome/dialog-price-editor.c
@@ -392,8 +392,8 @@ gnc_price_pedit_dialog_create (GtkWidget *parent,
 
 
     builder = gtk_builder_new();
-    gnc_builder_add_from_file (builder, "price.glade", "liststore1");
-    gnc_builder_add_from_file (builder, "price.glade", "Price Dialog");
+    gnc_builder_add_from_file (builder, "dialog-price.glade", "liststore1");
+    gnc_builder_add_from_file (builder, "dialog-price.glade", "Price Dialog");
 
     pedit_dialog->session = session;
     pedit_dialog->book = qof_session_get_book(pedit_dialog->session);
diff --git a/src/gnome/gtkbuilder/Makefile.am b/src/gnome/gtkbuilder/Makefile.am
index 2a0ef7e5a3..bac8774705 100644
--- a/src/gnome/gtkbuilder/Makefile.am
+++ b/src/gnome/gtkbuilder/Makefile.am
@@ -5,20 +5,20 @@ gtkbuilder_DATA = \
 	assistant-hierarchy.glade \
 	assistant-loan.glade \
 	assistant-stock-split.glade \
-	autoclear.glade \
 	budget.glade \
-	commodities.glade \
+	dialog-commodities.glade \
 	dialog-lot-viewer.glade \
-	fincalc.glade \
+	dialog-fincalc.glade \
+	dialog-price.glade \
+	dialog-print-check.glade \
 	newuser.glade \
 	owner.glade \
-	price.glade \
-	dialog-print-check.glade \
 	progress.glade \
 	reconcile.glade \
 	register.glade \
 	sched-xact.glade \
 	tax.glade \
-	userpass.glade
+	userpass.glade \
+	window-autoclear.glade
 
 EXTRA_DIST = $(gtkbuilder_DATA)
diff --git a/src/gnome/gtkbuilder/commodities.glade b/src/gnome/gtkbuilder/dialog-commodities.glade
similarity index 100%
rename from src/gnome/gtkbuilder/commodities.glade
rename to src/gnome/gtkbuilder/dialog-commodities.glade
diff --git a/src/gnome/gtkbuilder/fincalc.glade b/src/gnome/gtkbuilder/dialog-fincalc.glade
similarity index 100%
rename from src/gnome/gtkbuilder/fincalc.glade
rename to src/gnome/gtkbuilder/dialog-fincalc.glade
diff --git a/src/gnome/gtkbuilder/price.glade b/src/gnome/gtkbuilder/dialog-price.glade
similarity index 100%
rename from src/gnome/gtkbuilder/price.glade
rename to src/gnome/gtkbuilder/dialog-price.glade
diff --git a/src/gnome/gtkbuilder/autoclear.glade b/src/gnome/gtkbuilder/window-autoclear.glade
similarity index 100%
rename from src/gnome/gtkbuilder/autoclear.glade
rename to src/gnome/gtkbuilder/window-autoclear.glade
diff --git a/src/gnome/window-autoclear.c b/src/gnome/window-autoclear.c
index 2bccd2dd77..627cfd9b7c 100644
--- a/src/gnome/window-autoclear.c
+++ b/src/gnome/window-autoclear.c
@@ -310,7 +310,7 @@ autoClearWindow (GtkWidget *parent, Account *account)
 
     /* Create the dialog box */
     builder = gtk_builder_new();
-    gnc_builder_add_from_file (builder, "autoclear.glade", "Auto-clear Start Dialog");
+    gnc_builder_add_from_file (builder, "window-autoclear.glade", "Auto-clear Start Dialog");
     data->window = GTK_WIDGET(gtk_builder_get_object (builder, "Auto-clear Start Dialog"));
     title = gnc_autoclear_make_window_name (account);
     gtk_window_set_title(GTK_WINDOW(data->window), title);