diff --git a/swh/storage/migrate_extrinsic_metadata.py b/swh/storage/migrate_extrinsic_metadata.py
--- a/swh/storage/migrate_extrinsic_metadata.py
+++ b/swh/storage/migrate_extrinsic_metadata.py
@@ -62,7 +62,7 @@
 DEPOSIT_COLS = [
     "deposit.id",
     "deposit.external_id",
-    "deposit.swh_id_context",
+    "deposit.swhid_context",
     "deposit.status",
     "deposit_request.metadata",
     "deposit_request.date",
@@ -394,9 +394,9 @@
         date = deposit_request["deposit_request.date"]
         dates.add(date)
 
-        assert deposit_request["deposit.swh_id_context"], deposit_request
+        assert deposit_request["deposit.swhid_context"], deposit_request
         external_identifiers.add(deposit_request["deposit.external_id"])
-        swhids.add(deposit_request["deposit.swh_id_context"])
+        swhids.add(deposit_request["deposit.swhid_context"])
 
         # Client of the deposit
         provider_urls.add(deposit_request["deposit_client.provider_url"])
diff --git a/swh/storage/tests/migrate_extrinsic_metadata/test_deposit.py b/swh/storage/tests/migrate_extrinsic_metadata/test_deposit.py
--- a/swh/storage/tests/migrate_extrinsic_metadata/test_deposit.py
+++ b/swh/storage/tests/migrate_extrinsic_metadata/test_deposit.py
@@ -139,7 +139,7 @@
         {
             "deposit.id": 467,
             "deposit.external_id": "check-deposit-2020-03-11T11:07:18.424476",
-            "deposit.swh_id_context": swhid,
+            "deposit.swhid_context": swhid,
             "deposit.status": "success",
             "deposit_request.metadata": extrinsic_metadata,
             "deposit_request.date": datetime.datetime(
@@ -152,7 +152,7 @@
         {
             "deposit.id": 467,
             "deposit.external_id": "check-deposit-2020-03-11T11:07:18.424476",
-            "deposit.swh_id_context": swhid,
+            "deposit.swhid_context": swhid,
             "deposit.status": "success",
             "deposit_request.metadata": None,
             "deposit_request.date": datetime.datetime(
@@ -300,7 +300,7 @@
         {
             "deposit.id": 82,
             "deposit.external_id": "hal-01243573",
-            "deposit.swh_id_context": swhid,
+            "deposit.swhid_context": swhid,
             "deposit.status": "success",
             "deposit_request.metadata": None,
             "deposit_request.date": datetime.datetime(
@@ -313,7 +313,7 @@
         {
             "deposit.id": 82,
             "deposit.external_id": "hal-01243573",
-            "deposit.swh_id_context": swhid,
+            "deposit.swhid_context": swhid,
             "deposit.status": "success",
             "deposit_request.metadata": extrinsic_metadata,
             "deposit_request.date": datetime.datetime(
@@ -460,7 +460,7 @@
         {
             "deposit.id": 687,
             "deposit.external_id": "check-deposit-2020-06-26T13:50:07.564420",
-            "deposit.swh_id_context": swhid,
+            "deposit.swhid_context": swhid,
             "deposit.status": "success",
             "deposit_request.metadata": extrinsic_metadata,
             "deposit_request.date": datetime.datetime(
@@ -473,7 +473,7 @@
         {
             "deposit.id": 687,
             "deposit.external_id": "check-deposit-2020-06-26T13:50:07.564420",
-            "deposit.swh_id_context": swhid,
+            "deposit.swhid_context": swhid,
             "deposit.status": "success",
             "deposit_request.metadata": None,
             "deposit_request.date": datetime.datetime(
@@ -608,7 +608,7 @@
         {
             "deposit.id": 268,
             "deposit.external_id": "f80482de-90a8-4c32-bce4-6f6918d492ff",
-            "deposit.swh_id_context": swhid,
+            "deposit.swhid_context": swhid,
             "deposit.status": "success",
             "deposit_request.metadata": extrinsic_metadata,
             "deposit_request.date": datetime.datetime(
@@ -621,7 +621,7 @@
         {
             "deposit.id": 268,
             "deposit.external_id": "f80482de-90a8-4c32-bce4-6f6918d492ff",
-            "deposit.swh_id_context": swhid,
+            "deposit.swhid_context": swhid,
             "deposit.status": "success",
             "deposit_request.metadata": None,
             "deposit_request.date": datetime.datetime(
@@ -634,7 +634,7 @@
         {
             "deposit.id": 268,
             "deposit.external_id": "f80482de-90a8-4c32-bce4-6f6918d492ff",
-            "deposit.swh_id_context": swhid,
+            "deposit.swhid_context": swhid,
             "deposit.status": "success",
             "deposit_request.metadata": extrinsic_metadata,
             "deposit_request.date": datetime.datetime(
@@ -647,7 +647,7 @@
         {
             "deposit.id": 268,
             "deposit.external_id": "f80482de-90a8-4c32-bce4-6f6918d492ff",
-            "deposit.swh_id_context": swhid,
+            "deposit.swhid_context": swhid,
             "deposit.status": "success",
             "deposit_request.metadata": None,
             "deposit_request.date": datetime.datetime(
@@ -847,7 +847,7 @@
         {
             "deposit.id": 79,
             "deposit.external_id": "hal-01243573",
-            "deposit.swh_id_context": swhid,
+            "deposit.swhid_context": swhid,
             "deposit.status": "success",
             "deposit_request.metadata": None,
             "deposit_request.date": datetime.datetime(
@@ -860,7 +860,7 @@
         {
             "deposit.id": 79,
             "deposit.external_id": "hal-01243573",
-            "deposit.swh_id_context": swhid,
+            "deposit.swhid_context": swhid,
             "deposit.status": "success",
             "deposit_request.metadata": extrinsic_metadata,
             "deposit_request.date": datetime.datetime(
@@ -953,7 +953,7 @@
         {
             "deposit.id": 75,
             "deposit.external_id": "hal-01588781",
-            "deposit.swh_id_context": swhid,
+            "deposit.swhid_context": swhid,
             "deposit.status": "success",
             "deposit_request.metadata": None,
             "deposit_request.date": datetime.datetime(
@@ -966,7 +966,7 @@
         {
             "deposit.id": 75,
             "deposit.external_id": "hal-01588781",
-            "deposit.swh_id_context": swhid,
+            "deposit.swhid_context": swhid,
             "deposit.status": "success",
             "deposit_request.metadata": extrinsic_metadata,
             "deposit_request.date": datetime.datetime(
@@ -1082,7 +1082,7 @@
         {
             "deposit.id": 229,
             "deposit.external_id": "hal-01243573",
-            "deposit.swh_id_context": swhid,
+            "deposit.swhid_context": swhid,
             "deposit.status": "success",
             "deposit_request.metadata": None,
             "deposit_request.date": datetime.datetime(
@@ -1095,7 +1095,7 @@
         {
             "deposit.id": 229,
             "deposit.external_id": "hal-01243573",
-            "deposit.swh_id_context": swhid,
+            "deposit.swhid_context": swhid,
             "deposit.status": "success",
             "deposit_request.metadata": extrinsic_metadata,
             "deposit_request.date": datetime.datetime(