diff --git a/swh/journal/backfill.py b/swh/journal/backfill.py
--- a/swh/journal/backfill.py
+++ b/swh/journal/backfill.py
@@ -87,8 +87,8 @@
     ],
     'snapshot': ['id', 'object_id'],
     'origin': ['type', 'url'],
-    'origin_visit': ['visit', 'type', 'url', 'date',
-                     'snapshot', 'status', 'metadata'],
+    'origin_visit': ['visit', 'origin.type', 'origin_visit.type',
+                     'url', 'date', 'snapshot', 'status', 'metadata'],
 }
 
 
@@ -185,10 +185,11 @@
 
 def origin_visit_converter(db, origin_visit):
     origin = {
-        'type': origin_visit.pop('type'),
+        'type': origin_visit.pop('origin.type'),
         'url': origin_visit.pop('url'),
     }
     origin_visit['origin'] = origin
+    origin_visit['type'] = origin_visit.pop('origin_visit.type')
     return origin_visit
 
 
diff --git a/swh/journal/tests/test_backfill.py b/swh/journal/tests/test_backfill.py
--- a/swh/journal/tests/test_backfill.py
+++ b/swh/journal/tests/test_backfill.py
@@ -93,11 +93,12 @@
     assert where_args == [1, 10]
 
     assert column_aliases == [
-        'visit', 'type', 'url', 'date', 'snapshot', 'status', 'metadata',
+        'visit', 'origin.type', 'origin_visit.type',
+        'url', 'date', 'snapshot', 'status', 'metadata',
     ]
 
     assert query == '''
-select visit,type,url,date,snapshot,status,metadata
+select visit,origin.type,origin_visit.type,url,date,snapshot,status,metadata
 from origin_visit
 left join origin on origin_visit.origin=origin.id
 where (origin_visit.origin) >= %s and (origin_visit.origin) < %s