diff --git a/lib/types/hashtable.c b/lib/types/hashtable.c
index 419e8be7486ef5d30aacf45526ad355a99122b37..7cbe6a7c8f1a4cb417a7f326ebcaf8fcfafc768d 100644
--- a/lib/types/hashtable.c
+++ b/lib/types/hashtable.c
@@ -18,7 +18,7 @@ struct _HashTable
   SList **array;
 
   HashFunc hash_func;
-  HashEqualFunc equal_func;
+  EqualFunc equal_func;
   FreeFunc free_key_func;
   FreeFunc free_value_func;
 };
@@ -65,10 +65,10 @@ key_value_free (KeyValue *kv,
  * Creates a new #HashTable.
  */
 HashTable *
-hash_table_new (HashFunc      hash_func,
-                HashEqualFunc equal_func,
-                FreeFunc      free_key_func,
-                FreeFunc      free_value_func)
+hash_table_new (HashFunc  hash_func,
+                EqualFunc equal_func,
+                FreeFunc  free_key_func,
+                FreeFunc  free_value_func)
 
 {
   HashTable *new = check_malloc (sizeof (HashTable));
diff --git a/lib/types/hashtable.h b/lib/types/hashtable.h
index bd7f71c815bc3f62c9cc4fef083adba07f7d0f2a..c71f049c34d779a3ab2b37ccb5f93227aaca7680 100644
--- a/lib/types/hashtable.h
+++ b/lib/types/hashtable.h
@@ -7,7 +7,7 @@ typedef struct _HashTable HashTable;
 
 
 HashTable *  hash_table_new     (HashFunc      hash_func,
-                                 HashEqualFunc equal_func,
+                                 EqualFunc     equal_func,
                                  FreeFunc      free_key_func,
                                  FreeFunc      free_value_func);
 void         hash_table_free    (HashTable    *self);
diff --git a/lib/types/types.h b/lib/types/types.h
index c7c115b55a87ba902409f7297801cdd6651e9232..7b59b918174f032000123e0615be58d747b4807a 100644
--- a/lib/types/types.h
+++ b/lib/types/types.h
@@ -8,10 +8,10 @@ typedef void   (*ForEachFunc) (void       *data,
 typedef double (*ValueFunc)   (const void *element);
 typedef int    (*CompareFunc) (const void *a,
                                const void *b);
+typedef bool   (*EqualFunc)   (const void *a,
+                               const void *b);
 
-typedef unsigned (*HashFunc)      (const void *key);
-typedef bool     (*HashEqualFunc) (const void *a,
-                                   const void *b);
-typedef void     (*HashIterFunc)  (void       *key,
-                                   void       *value,
-                                   void       *user_data);
+typedef unsigned (*HashFunc)     (const void *key);
+typedef void     (*HashIterFunc) (void       *key,
+                                  void       *value,
+                                  void       *user_data);