diff --git a/g10/cipher.c b/g10/cipher.c
index f10ce486b..f577c97db 100644
--- a/g10/cipher.c
+++ b/g10/cipher.c
@@ -119,7 +119,8 @@ write_header (cipher_filter_context_t *cfx, iobuf_t a)
  * This filter is used to en/de-cipher data with a symmetric algorithm
  */
 int
-cipher_filter (void *opaque, int control, iobuf_t a, byte *buf, size_t *ret_len)
+cipher_filter_cfb (void *opaque, int control,
+                   iobuf_t a, byte *buf, size_t *ret_len)
 {
   cipher_filter_context_t *cfx = opaque;
   size_t size = *ret_len;
@@ -179,7 +180,7 @@ cipher_filter (void *opaque, int control, iobuf_t a, byte *buf, size_t *ret_len)
     }
   else if (control == IOBUFCTRL_DESC)
     {
-      mem2str (buf, "cipher_filter", *ret_len);
+      mem2str (buf, "cipher_filter_cfb", *ret_len);
     }
 
   return rc;
diff --git a/g10/encrypt.c b/g10/encrypt.c
index e3e044f23..9cf8abdd7 100644
--- a/g10/encrypt.c
+++ b/g10/encrypt.c
@@ -321,7 +321,7 @@ encrypt_simple (const char *filename, int mode, int use_seskey)
 
   /* Register the cipher filter. */
   if (mode)
-    iobuf_push_filter ( out, cipher_filter, &cfx );
+    iobuf_push_filter ( out, cipher_filter_cfb, &cfx );
 
   /* Register the compress filter. */
   if ( do_compress )
@@ -741,7 +741,7 @@ encrypt_crypt (ctrl_t ctrl, int filefd, const char *filename,
     cfx.datalen = filesize && !do_compress ? filesize : 0;
 
   /* Register the cipher filter. */
-  iobuf_push_filter (out, cipher_filter, &cfx);
+  iobuf_push_filter (out, cipher_filter_cfb, &cfx);
 
   /* Register the compress filter. */
   if (do_compress)
@@ -897,7 +897,7 @@ encrypt_filter (void *opaque, int control,
                 return rc;
             }
 
-          iobuf_push_filter (a, cipher_filter, &efx->cfx);
+          iobuf_push_filter (a, cipher_filter_cfb, &efx->cfx);
 
           efx->header_okay = 1;
         }
diff --git a/g10/filter.h b/g10/filter.h
index 2c1e513ce..d2f6c3f0f 100644
--- a/g10/filter.h
+++ b/g10/filter.h
@@ -146,8 +146,8 @@ gpg_error_t push_compress_filter2 (iobuf_t out,compress_filter_context_t *zfx,
                                    int algo, int rel);
 
 /*-- cipher.c --*/
-int cipher_filter( void *opaque, int control,
-		   iobuf_t chain, byte *buf, size_t *ret_len);
+int cipher_filter_cfb (void *opaque, int control,
+                       iobuf_t chain, byte *buf, size_t *ret_len);
 
 /*-- textfilter.c --*/
 int text_filter( void *opaque, int control,
diff --git a/g10/gpgcompose.c b/g10/gpgcompose.c
index 229a4e5ea..d82995d1d 100644
--- a/g10/gpgcompose.c
+++ b/g10/gpgcompose.c
@@ -2576,7 +2576,7 @@ encrypted (const char *option, int argc, char *argv[], void *cookie)
 
   cfx->datalen = 0;
 
-  filter_push (out, cipher_filter, cfx, PKT_ENCRYPTED, cfx->datalen == 0);
+  filter_push (out, cipher_filter_cfb, cfx, PKT_ENCRYPTED, cfx->datalen == 0);
 
   debug ("Wrote encrypted packet:\n");
 
diff --git a/g10/sign.c b/g10/sign.c
index 2f48a7078..f27231950 100644
--- a/g10/sign.c
+++ b/g10/sign.c
@@ -1510,7 +1510,7 @@ sign_symencrypt_file (ctrl_t ctrl, const char *fname, strlist_t locusr)
     }
 
     /* Push the encryption filter */
-    iobuf_push_filter( out, cipher_filter, &cfx );
+    iobuf_push_filter (out, cipher_filter_cfb, &cfx );
 
     /* Push the compress filter */
     if (default_compress_algo())