diff --git a/epan/dissector_filters.c b/epan/dissector_filters.c
index e74c76d9ae..8b84f5ec15 100644
--- a/epan/dissector_filters.c
+++ b/epan/dissector_filters.c
@@ -33,7 +33,7 @@ GList *conv_filter_list = NULL;
 
 
 void register_conversation_filter(const char *proto_name, const char *display_name,
-                                        is_conv_valid_func is_filter_valid, build_conv_string_func build_filter_string) {
+                                        is_filter_valid_func is_filter_valid, build_filter_string_func build_filter_string) {
     conversation_filter_t *entry;
 
     entry = (conversation_filter_t *)g_malloc(sizeof(conversation_filter_t));
diff --git a/epan/dissector_filters.h b/epan/dissector_filters.h
index bba41f738d..8e001d0207 100644
--- a/epan/dissector_filters.h
+++ b/epan/dissector_filters.h
@@ -34,17 +34,17 @@ extern "C" {
  */
 
 /** callback function definition: is a filter available for this packet? */
-typedef gboolean (*is_conv_valid_func)(packet_info *pinfo);
+typedef gboolean (*is_filter_valid_func)(packet_info *pinfo);
 
 /** callback function definition: return the available filter for this packet or NULL if no filter is available,
     Filter needs to be freed after use */
-typedef gchar* (*build_conv_string_func)(packet_info *pinfo);
+typedef gchar* (*build_filter_string_func)(packet_info *pinfo);
 
 #define MAX_NUM_COLOR_CONVERSATION_COLORS       10
 
 /** register a dissector filter */
 WS_DLL_PUBLIC void register_conversation_filter(const char *proto_name, const char *display_name,
-                                                      is_conv_valid_func is_filter_valid, build_conv_string_func build_filter_string);
+                                                      is_filter_valid_func is_filter_valid, build_filter_string_func build_filter_string);
 
 WS_DLL_PUBLIC struct conversation_filter_s* find_conversation_filter(const char *proto_name);
 
@@ -53,8 +53,8 @@ WS_DLL_PUBLIC struct conversation_filter_s* find_conversation_filter(const char
 typedef struct conversation_filter_s {
     const char *              proto_name;
     const char *              display_name;
-    is_conv_valid_func        is_filter_valid;
-    build_conv_string_func    build_filter_string;
+    is_filter_valid_func      is_filter_valid;
+    build_filter_string_func  build_filter_string;
 } conversation_filter_t;
 
 WS_DLL_PUBLIC GList *conv_filter_list;