diff --git a/swh/dataset/relational.py b/swh/dataset/relational.py
--- a/swh/dataset/relational.py
+++ b/swh/dataset/relational.py
@@ -25,7 +25,7 @@
         ("id", "string"),
     ],
     "snapshot_branch": [
-        ("snapshot_id", "string"),
+        ("id", "string"),
         ("name", "binary"),
         ("target", "string"),
         ("target_type", "string"),
@@ -63,7 +63,7 @@
         ("id", "string"),
     ],
     "directory_entry": [
-        ("directory_id", "string"),
+        ("id", "string"),
         ("name", "binary"),
         ("type", "string"),
         ("target", "string"),