diff --git a/panels/printers/pp-new-printer-dialog.c b/panels/printers/pp-new-printer-dialog.c
index 66a877aea..32df0c073 100644
--- a/panels/printers/pp-new-printer-dialog.c
+++ b/panels/printers/pp-new-printer-dialog.c
@@ -1847,7 +1847,7 @@ pp_new_printer_dialog_class_init (PpNewPrinterDialogClass *klass)
 
   g_type_ensure (PP_TYPE_PRINT_DEVICE);
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/printers/new-printer-dialog.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/printers/pp-new-printer-dialog.ui");
 
   gtk_widget_class_bind_template_child (widget_class, PpNewPrinterDialog, devices_liststore);
   gtk_widget_class_bind_template_child (widget_class, PpNewPrinterDialog, devices_model_filter);
diff --git a/panels/printers/new-printer-dialog.ui b/panels/printers/pp-new-printer-dialog.ui
similarity index 100%
rename from panels/printers/new-printer-dialog.ui
rename to panels/printers/pp-new-printer-dialog.ui
diff --git a/panels/printers/pp-ppd-selection-dialog.c b/panels/printers/pp-ppd-selection-dialog.c
index 9aac84af3..d74cca1e4 100644
--- a/panels/printers/pp-ppd-selection-dialog.c
+++ b/panels/printers/pp-ppd-selection-dialog.c
@@ -350,7 +350,7 @@ pp_ppd_selection_dialog_class_init (PpPPDSelectionDialogClass *klass)
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
   GObjectClass   *object_class = G_OBJECT_CLASS (klass);
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/printers/ppd-selection-dialog.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/printers/pp-ppd-selection-dialog.ui");
   gtk_widget_class_bind_template_child (widget_class, PpPPDSelectionDialog, ppd_selection_select_button);
   gtk_widget_class_bind_template_child (widget_class, PpPPDSelectionDialog, ppd_spinner);
   gtk_widget_class_bind_template_child (widget_class, PpPPDSelectionDialog, progress_label);
diff --git a/panels/printers/ppd-selection-dialog.ui b/panels/printers/pp-ppd-selection-dialog.ui
similarity index 100%
rename from panels/printers/ppd-selection-dialog.ui
rename to panels/printers/pp-ppd-selection-dialog.ui
diff --git a/panels/printers/pp-printer-entry.c b/panels/printers/pp-printer-entry.c
index 54b14772b..c98ed1a9e 100644
--- a/panels/printers/pp-printer-entry.c
+++ b/panels/printers/pp-printer-entry.c
@@ -1020,7 +1020,7 @@ pp_printer_entry_class_init (PpPrinterEntryClass *klass)
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
   GObjectClass   *object_class = G_OBJECT_CLASS (klass);
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/printers/printer-entry.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/printers/pp-printer-entry.ui");
 
   gtk_widget_class_bind_template_child (widget_class, PpPrinterEntry, header_box);
   gtk_widget_class_bind_template_child (widget_class, PpPrinterEntry, printer_name_label);
diff --git a/panels/printers/printer-entry.ui b/panels/printers/pp-printer-entry.ui
similarity index 100%
rename from panels/printers/printer-entry.ui
rename to panels/printers/pp-printer-entry.ui
diff --git a/panels/printers/printers.gresource.xml b/panels/printers/printers.gresource.xml
index e040265d2..01b4581c6 100644
--- a/panels/printers/printers.gresource.xml
+++ b/panels/printers/printers.gresource.xml
@@ -2,13 +2,13 @@
 <gresources>
   <gresource prefix="/org/gnome/control-center/printers">
     <file preprocess="xml-stripblanks">cc-printers-panel.ui</file>
-    <file preprocess="xml-stripblanks">new-printer-dialog.ui</file>
+    <file preprocess="xml-stripblanks">pp-new-printer-dialog.ui</file>
     <file preprocess="xml-stripblanks">pp-options-dialog.ui</file>
-    <file preprocess="xml-stripblanks">ppd-selection-dialog.ui</file>
+    <file preprocess="xml-stripblanks">pp-ppd-selection-dialog.ui</file>
     <file preprocess="xml-stripblanks">pp-details-dialog.ui</file>
     <file preprocess="xml-stripblanks">pp-job-row.ui</file>
     <file preprocess="xml-stripblanks">pp-jobs-dialog.ui</file>
-    <file preprocess="xml-stripblanks">printer-entry.ui</file>
+    <file preprocess="xml-stripblanks">pp-printer-entry.ui</file>
     <file>printers.css</file>
   </gresource>
 </gresources>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 099a88a0b..946b6ae7c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -128,10 +128,8 @@ panels/power/gnome-power-panel.desktop.in
 panels/printers/cc-printers-panel.c
 panels/printers/cc-printers-panel.ui
 panels/printers/gnome-printers-panel.desktop.in
-panels/printers/new-printer-dialog.ui
 panels/printers/pp-details-dialog.c
 panels/printers/pp-details-dialog.ui
-panels/printers/ppd-selection-dialog.ui
 panels/printers/pp-host.c
 panels/printers/pp-ipp-option-widget.c
 panels/printers/pp-job-row.c
@@ -139,12 +137,14 @@ panels/printers/pp-jobs-dialog.c
 panels/printers/pp-jobs-dialog.ui
 panels/printers/pp-new-printer.c
 panels/printers/pp-new-printer-dialog.c
+panels/printers/pp-new-printer-dialog.ui
 panels/printers/pp-options-dialog.c
 panels/printers/pp-options-dialog.ui
 panels/printers/pp-ppd-option-widget.c
 panels/printers/pp-ppd-selection-dialog.c
+panels/printers/pp-ppd-selection-dialog.ui
 panels/printers/pp-printer-entry.c
-panels/printers/printer-entry.ui
+panels/printers/pp-printer-entry.ui
 panels/privacy/bolt/cc-bolt-device-dialog.c
 panels/privacy/bolt/cc-bolt-device-dialog.ui
 panels/privacy/bolt/cc-bolt-device-entry.c