diff --git a/backend/Makefile.am b/backend/Makefile.am
index c9dac45a9..95714080c 100644
--- a/backend/Makefile.am
+++ b/backend/Makefile.am
@@ -865,7 +865,7 @@ libsane_pint_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=pint
 libsane_pint_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
 libsane_pint_la_LIBADD = $(COMMON_LIBS) libpint.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo
 
-libpixma_la_SOURCES = pixma.c pixma.h pixma_io_sanei.c pixma_io.h pixma_common.c pixma_common.h pixma_mp150.c pixma_mp730.c pixma_mp750.c pixma_mp810.c pixma_imageclass.c pixma_bjnp.c pixma_bjnp.h pixma_bjnp_private.h pixma_rename.h
+libpixma_la_SOURCES = pixma.c pixma.h pixma_io_sanei.c pixma_io.h pixma_common.c pixma_common.h pixma_mp150.c pixma_mp730.c pixma_mp750.c pixma_mp800.c pixma_imageclass.c pixma_bjnp.c pixma_bjnp.h pixma_bjnp_private.h pixma_rename.h
 libpixma_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=pixma
 
 nodist_libsane_pixma_la_SOURCES = pixma-s.c
diff --git a/backend/pixma.h b/backend/pixma.h
index 93cdf9c9f..572ff6774 100644
--- a/backend/pixma.h
+++ b/backend/pixma.h
@@ -313,7 +313,7 @@ struct pixma_scan_param_t
 
   /** Flag indicating whether the offset correction for TPU scans
    *  was already performed (to avoid repeated corrections).
-   *  Currently only used in pixma_mp810.c sub-driver */
+   *  Currently only used in pixma_mp800.c sub-driver */
   unsigned tpu_offset_added;
 
   /* Flag indicating if data from scanner will be in JPEG format */
diff --git a/backend/pixma_common.c b/backend/pixma_common.c
index 82c4fde55..22f093e9e 100644
--- a/backend/pixma_common.c
+++ b/backend/pixma_common.c
@@ -69,14 +69,14 @@
 extern const pixma_config_t pixma_mp150_devices[];
 extern const pixma_config_t pixma_mp750_devices[];
 extern const pixma_config_t pixma_mp730_devices[];
-extern const pixma_config_t pixma_mp810_devices[];
+extern const pixma_config_t pixma_mp800_devices[];
 extern const pixma_config_t pixma_iclass_devices[];
 
 static const pixma_config_t *const pixma_devices[] = {
   pixma_mp150_devices,
   pixma_mp750_devices,
   pixma_mp730_devices,
-  pixma_mp810_devices,
+  pixma_mp800_devices,
   pixma_iclass_devices,
   NULL
 };
diff --git a/backend/pixma_mp810.c b/backend/pixma_mp800.c
similarity index 99%
rename from backend/pixma_mp810.c
rename to backend/pixma_mp800.c
index c81f35daa..d8d3d71b2 100644
--- a/backend/pixma_mp810.c
+++ b/backend/pixma_mp800.c
@@ -2363,7 +2363,7 @@ static int mp810_get_status (pixma_t * s, pixma_device_status_t * status)
   return 0;
 }
 
-static const pixma_scan_ops_t pixma_mp810_ops =
+static const pixma_scan_ops_t pixma_mp800_ops =
 {
   mp810_open,
   mp810_close,
@@ -2380,7 +2380,7 @@ static const pixma_scan_ops_t pixma_mp810_ops =
         model,             /* model */              \
         CANON_VID, pid,    /* vid pid */            \
         0,                 /* iface */              \
-        &pixma_mp810_ops,  /* ops */                \
+        &pixma_mp800_ops,  /* ops */                \
         dpi, 2*(dpi),      /* xdpi, ydpi */         \
         adftpu_min_dpi, adftpu_max_dpi,  /* adftpu_min_dpi, adftpu_max_dpi */ \
         tpuir_min_dpi, tpuir_max_dpi,    /* tpuir_min_dpi, tpuir_max_dpi */   \
@@ -2394,7 +2394,7 @@ static const pixma_scan_ops_t pixma_mp810_ops =
 
 #define END_OF_DEVICE_LIST DEVICE(NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0)
 
-const pixma_config_t pixma_mp810_devices[] =
+const pixma_config_t pixma_mp800_devices[] =
 {
   /* Generation 1: CCD */
   DEVICE ("Canon PIXMA MP800", "MP800", MP800_PID, 2400, 150, 0, 0, 0, 638, 877, PIXMA_CAP_CCD | PIXMA_CAP_TPU),
diff --git a/backend/pixma_rename.h b/backend/pixma_rename.h
index ce68ed39e..ad3d96025 100644
--- a/backend/pixma_rename.h
+++ b/backend/pixma_rename.h
@@ -81,7 +81,7 @@
 #define pixma_mp150_devices sanei_pixma_mp150_devices
 #define pixma_mp730_devices sanei_pixma_mp730_devices
 #define pixma_mp750_devices sanei_pixma_mp750_devices
-#define pixma_mp810_devices sanei_pixma_mp810_devices
+#define pixma_mp800_devices sanei_pixma_mp800_devices
 #define pixma_iclass_devices sanei_pixma_iclass_devices
 #define pixma_newcmd sanei_pixma_newcmd
 #define pixma_open sanei_pixma_open