diff --git a/doc/bookmarkfs.texi b/doc/bookmarkfs.texi
index 8b163c6..a0d5ea3 100644
--- a/doc/bookmarkfs.texi
+++ b/doc/bookmarkfs.texi
@@ -1472,7 +1472,7 @@ struct bookmarkfs_backend @{
     bookmarkfs_bookmark_set_func     *bookmark_set;
     bookmarkfs_bookmark_sync_func    *bookmark_sync;
 
-    bookmarkfs_object_free_func *object_free;
+    bookmarkfs_cookie_free_func *cookie_free;
 @};
 @end example
 
diff --git a/src/backend.h b/src/backend.h
index ff6d19a..66909c4 100644
--- a/src/backend.h
+++ b/src/backend.h
@@ -82,9 +82,9 @@ enum bookmarkfs_bookmark_type {
     BOOKMARKFS_BOOKMARK_TYPE_KEYWORD,
 };
 
-enum bookmarkfs_object_type {
-    BOOKMARKFS_OBJECT_TYPE_BGCOOKIE,
-    BOOKMARKFS_OBJECT_TYPE_BLCOOKIE,
+enum bookmarkfs_cookie_type {
+    BOOKMARKFS_COOKIE_TYPE_WATCH,
+    BOOKMARKFS_COOKIE_TYPE_LIST,
 };
 
 struct bookmarkfs_backend_conf;
@@ -220,10 +220,10 @@ typedef int (bookmarkfs_bookmark_sync_func) (
     void *backend_ctx
 );
 
-typedef void (bookmarkfs_object_free_func) (
+typedef void (bookmarkfs_cookie_free_func) (
     void                        *backend_ctx,
-    void                        *object,
-    enum bookmarkfs_object_type  object_type
+    void                        *cookie,
+    enum bookmarkfs_cookie_type  cookie_type
 );
 
 struct bookmarkfs_backend {
@@ -246,7 +246,7 @@ struct bookmarkfs_backend {
     bookmarkfs_bookmark_set_func     *bookmark_set;
     bookmarkfs_bookmark_sync_func    *bookmark_sync;
 
-    bookmarkfs_object_free_func *object_free;
+    bookmarkfs_cookie_free_func *cookie_free;
 };
 
 struct bookmarkfs_backend_conf {
diff --git a/src/backend_chromium.c b/src/backend_chromium.c
index f979fe6..2b68185 100644
--- a/src/backend_chromium.c
+++ b/src/backend_chromium.c
@@ -2117,22 +2117,22 @@ bookmark_lookup (
 }
 
 static void
-object_free (
+cookie_free (
     void                        *UNUSED_VAR(backend_ctx),
-    void                        *object,
-    enum bookmarkfs_object_type  object_type
+    void                        *cookie,
+    enum bookmarkfs_cookie_type  cookie_type
 ) {
-    if (object == NULL) {
+    if (cookie == NULL) {
         return;
     }
 
-    switch (object_type) {
-      case BOOKMARKFS_OBJECT_TYPE_BGCOOKIE:
-        free_bgcookie(object);
+    switch (cookie_type) {
+      case BOOKMARKFS_COOKIE_TYPE_WATCH:
+        free_bgcookie(cookie);
         break;
 
-      case BOOKMARKFS_OBJECT_TYPE_BLCOOKIE:
-        free_blcookie(object);
+      case BOOKMARKFS_COOKIE_TYPE_LIST:
+        free_blcookie(cookie);
         break;
 
       default:
@@ -2706,7 +2706,7 @@ struct bookmarkfs_backend const bookmarkfs_backend_chromium = {
     .bookmark_list   = bookmark_list,
     .bookmark_lookup = bookmark_lookup,
 
-    .object_free = object_free,
+    .cookie_free = cookie_free,
 
 #ifdef BOOKMARKFS_BACKEND_CHROMIUM_WRITE
     .backend_mkfs = backend_mkfs,
diff --git a/src/backend_firefox.c b/src/backend_firefox.c
index 98bb5ed..e5bcf08 100644
--- a/src/backend_firefox.c
+++ b/src/backend_firefox.c
@@ -3192,22 +3192,22 @@ bookmark_lookup (
 }
 
 static void
-object_free (
+cookie_free (
     void                        *UNUSED_VAR(backend_ctx),
-    void                        *object,
-    enum bookmarkfs_object_type  object_type
+    void                        *cookie,
+    enum bookmarkfs_cookie_type  cookie_type
 ) {
-    if (object == NULL) {
+    if (cookie == NULL) {
         return;
     }
 
-    switch (object_type) {
-      case BOOKMARKFS_OBJECT_TYPE_BGCOOKIE:
-        free(object);
+    switch (cookie_type) {
+      case BOOKMARKFS_COOKIE_TYPE_WATCH:
+        free(cookie);
         break;
 
-      case BOOKMARKFS_OBJECT_TYPE_BLCOOKIE:
-        free_blcookie(object);
+      case BOOKMARKFS_COOKIE_TYPE_LIST:
+        free_blcookie(cookie);
         break;
 
       default:
@@ -3733,7 +3733,7 @@ struct bookmarkfs_backend const bookmarkfs_backend_firefox = {
     .bookmark_list   = bookmark_list,
     .bookmark_lookup = bookmark_lookup,
 
-    .object_free = object_free,
+    .cookie_free = cookie_free,
 
 #ifdef BOOKMARKFS_BACKEND_FIREFOX_WRITE
     .backend_mkfs = backend_mkfs,
diff --git a/src/fs_ops.c b/src/fs_ops.c
index 5fbc9d5..90ec891 100644
--- a/src/fs_ops.c
+++ b/src/fs_ops.c
@@ -500,7 +500,7 @@ bm_free (
         free(fh->buf);
     }
     if (fh->cookie != NULL) {
-        BACKEND_CALL(object_free, fh->cookie, BOOKMARKFS_OBJECT_TYPE_BGCOOKIE);
+        BACKEND_CALL(cookie_free, fh->cookie, BOOKMARKFS_COOKIE_TYPE_WATCH);
     }
     bm_fh_free(fh, -1);
     return status;
@@ -512,7 +512,7 @@ bm_freedir (
     fuse_ino_t  ino,
     void       *cookie
 ) {
-    BACKEND_CALL(object_free, cookie, BOOKMARKFS_OBJECT_TYPE_BLCOOKIE);
+    BACKEND_CALL(cookie_free, cookie, BOOKMARKFS_COOKIE_TYPE_LIST);
 
     unsigned long entry_id;
     struct fs_file_handle *fh = bm_fh_get(ino, NULL, &entry_id);
diff --git a/src/fsck_offline.c b/src/fsck_offline.c
index 7a9976d..b678a86 100644
--- a/src/fsck_offline.c
+++ b/src/fsck_offline.c
@@ -162,8 +162,7 @@ free_dir (
     struct fsck_ctx const *ctx,
     struct fsck_dir const *dir
 ) {
-    BACKEND_CALL(ctx, object_free,
-            dir->cookie, BOOKMARKFS_OBJECT_TYPE_BLCOOKIE);
+    BACKEND_CALL(ctx, cookie_free, dir->cookie, BOOKMARKFS_COOKIE_TYPE_LIST);
 }
 
 static int