diff --git a/app/actions/image-commands.c b/app/actions/image-commands.c
index abc85fe05d..529832da1d 100644
--- a/app/actions/image-commands.c
+++ b/app/actions/image-commands.c
@@ -57,8 +57,8 @@
 #include "display/gimpdisplayshell.h"
 
 #include "dialogs/color-profile-dialog.h"
+#include "dialogs/convert-indexed-dialog.h"
 #include "dialogs/convert-precision-dialog.h"
-#include "dialogs/convert-type-dialog.h"
 #include "dialogs/grid-dialog.h"
 #include "dialogs/image-merge-layers-dialog.h"
 #include "dialogs/image-new-dialog.h"
@@ -223,10 +223,10 @@ image_convert_base_type_cmd_callback (GtkAction *action,
       break;
 
     case GIMP_INDEXED:
-      dialog = convert_type_dialog_new (image,
-                                        action_data_get_context (data),
-                                        widget,
-                                        GIMP_PROGRESS (display));
+      dialog = convert_indexed_dialog_new (image,
+                                           action_data_get_context (data),
+                                           widget,
+                                           GIMP_PROGRESS (display));
       break;
     }
 
diff --git a/app/dialogs/Makefile.am b/app/dialogs/Makefile.am
index 8374b9bc95..91606311d6 100644
--- a/app/dialogs/Makefile.am
+++ b/app/dialogs/Makefile.am
@@ -30,10 +30,10 @@ libappdialogs_a_sources = \
 	color-profile-dialog.h		\
 	color-profile-import-dialog.c	\
 	color-profile-import-dialog.h	\
+	convert-indexed-dialog.c	\
+	convert-indexed-dialog.h	\
 	convert-precision-dialog.c	\
 	convert-precision-dialog.h	\
-	convert-type-dialog.c		\
-	convert-type-dialog.h		\
 	data-delete-dialog.c		\
 	data-delete-dialog.h		\
 	fade-dialog.c			\
diff --git a/app/dialogs/convert-type-dialog.c b/app/dialogs/convert-indexed-dialog.c
similarity index 98%
rename from app/dialogs/convert-type-dialog.c
rename to app/dialogs/convert-indexed-dialog.c
index f4f74b7225..f93948c822 100644
--- a/app/dialogs/convert-type-dialog.c
+++ b/app/dialogs/convert-indexed-dialog.c
@@ -39,7 +39,7 @@
 #include "widgets/gimpviewabledialog.h"
 #include "widgets/gimpwidgets-utils.h"
 
-#include "convert-type-dialog.h"
+#include "convert-indexed-dialog.h"
 
 #include "gimp-intl.h"
 
@@ -89,10 +89,10 @@ static GimpPalette            *saved_palette           = NULL;
 /*  public functions  */
 
 GtkWidget *
-convert_type_dialog_new (GimpImage    *image,
-                         GimpContext  *context,
-                         GtkWidget    *parent,
-                         GimpProgress *progress)
+convert_indexed_dialog_new (GimpImage    *image,
+                            GimpContext  *context,
+                            GtkWidget    *parent,
+                            GimpProgress *progress)
 {
   IndexedDialog *dialog;
   GtkWidget     *button;
diff --git a/app/dialogs/convert-type-dialog.h b/app/dialogs/convert-indexed-dialog.h
similarity index 67%
rename from app/dialogs/convert-type-dialog.h
rename to app/dialogs/convert-indexed-dialog.h
index 509dccc07b..59c07dad63 100644
--- a/app/dialogs/convert-type-dialog.h
+++ b/app/dialogs/convert-indexed-dialog.h
@@ -15,14 +15,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __CONVERT_TYPE_DIALOG_H__
-#define __CONVERT_TYPE_DIALOG_H__
+#ifndef __CONVERT_INDEXED_DIALOG_H__
+#define __CONVERT_INDEXED_DIALOG_H__
 
 
-GtkWidget * convert_type_dialog_new (GimpImage    *image,
-                                     GimpContext  *context,
-                                     GtkWidget    *parent,
-                                     GimpProgress *progress);
+GtkWidget * convert_indexed_dialog_new (GimpImage    *image,
+                                        GimpContext  *context,
+                                        GtkWidget    *parent,
+                                        GimpProgress *progress);
 
 
-#endif  /*  __CONVERT_TYPE_DIALOG_H__  */
+#endif  /*  __CONVERT_INDEXED_DIALOG_H__  */
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7d615ac965..8138ee92ee 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -192,8 +192,8 @@ app/dialogs/action-search-dialog.c
 app/dialogs/channel-options-dialog.c
 app/dialogs/color-profile-dialog.c
 app/dialogs/color-profile-import-dialog.c
+app/dialogs/convert-indexed-dialog.c
 app/dialogs/convert-precision-dialog.c
-app/dialogs/convert-type-dialog.c
 app/dialogs/data-delete-dialog.c
 app/dialogs/dialogs-constructors.c
 app/dialogs/dialogs.c