diff --git a/swh/deposit/templates/deposit/content.xml b/swh/deposit/templates/deposit/content.xml
--- a/swh/deposit/templates/deposit/content.xml
+++ b/swh/deposit/templates/deposit/content.xml
@@ -1,5 +1,5 @@
 <entry xmlns="http://www.w3.org/2005/Atom"
-       xmlns:sword="http://purl.org/net/sword/"
+       xmlns:sword="http://purl.org/net/sword/terms/"
        xmlns:dcterms="http://purl.org/dc/terms/"
        xmlns:sd="https://www.softwareheritage.org/schema/2018/deposit"
        >
diff --git a/swh/deposit/templates/deposit/deposit_receipt.xml b/swh/deposit/templates/deposit/deposit_receipt.xml
--- a/swh/deposit/templates/deposit/deposit_receipt.xml
+++ b/swh/deposit/templates/deposit/deposit_receipt.xml
@@ -1,5 +1,5 @@
 <entry xmlns="http://www.w3.org/2005/Atom"
-       xmlns:sword="http://purl.org/net/sword/"
+       xmlns:sword="http://purl.org/net/sword/terms/"
        xmlns:dcterms="http://purl.org/dc/terms/"
        xmlns:sd="https://www.softwareheritage.org/schema/2018/deposit"
        >
diff --git a/swh/deposit/templates/deposit/error.xml b/swh/deposit/templates/deposit/error.xml
--- a/swh/deposit/templates/deposit/error.xml
+++ b/swh/deposit/templates/deposit/error.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <sword:error xmlns="http://www.w3.org/2005/Atom"
-       xmlns:sword="http://purl.org/net/sword/">
+             xmlns:sword="http://purl.org/net/sword/terms/">
     <summary>{{ summary }}</summary>
     <sword:treatment>processing failed</sword:treatment>
     {% if verboseDescription is not None %}
diff --git a/swh/deposit/templates/deposit/status.xml b/swh/deposit/templates/deposit/status.xml
--- a/swh/deposit/templates/deposit/status.xml
+++ b/swh/deposit/templates/deposit/status.xml
@@ -1,5 +1,5 @@
 <entry xmlns="http://www.w3.org/2005/Atom"
-       xmlns:sword="http://purl.org/net/sword/"
+       xmlns:sword="http://purl.org/net/sword/terms/"
        xmlns:dcterms="http://purl.org/dc/terms/"
        xmlns:sd="https://www.softwareheritage.org/schema/2018/deposit"
        >
diff --git a/swh/deposit/tests/data/https_deposit.test.metadata/1_test b/swh/deposit/tests/data/https_deposit.test.metadata/1_test
--- a/swh/deposit/tests/data/https_deposit.test.metadata/1_test
+++ b/swh/deposit/tests/data/https_deposit.test.metadata/1_test
@@ -1,5 +1,5 @@
 <entry xmlns="http://www.w3.org/2005/Atom"
-       xmlns:sword="http://purl.org/net/sword/"
+       xmlns:sword="http://purl.org/net/sword/terms/"
        xmlns:dcterms="http://purl.org/dc/terms/"
        xmlns:sd="https://www.softwareheritage.org/schema/2018/deposit"
        >
diff --git a/swh/deposit/tests/data/https_deposit.test.metadata/1_test_666_metadata b/swh/deposit/tests/data/https_deposit.test.metadata/1_test_666_metadata
--- a/swh/deposit/tests/data/https_deposit.test.metadata/1_test_666_metadata
+++ b/swh/deposit/tests/data/https_deposit.test.metadata/1_test_666_metadata
@@ -1,5 +1,5 @@
 <entry xmlns="http://www.w3.org/2005/Atom"
-       xmlns:sword="http://purl.org/net/sword/"
+       xmlns:sword="http://purl.org/net/sword/terms/"
        xmlns:dcterms="http://purl.org/dc/terms/"
        xmlns:sd="https://www.softwareheritage.org/schema/2018/deposit">
     <sd:deposit_id>666</sd:deposit_id>
diff --git a/swh/deposit/tests/data/https_deposit.test.metadata/1_test_666_status b/swh/deposit/tests/data/https_deposit.test.metadata/1_test_666_status
--- a/swh/deposit/tests/data/https_deposit.test.metadata/1_test_666_status
+++ b/swh/deposit/tests/data/https_deposit.test.metadata/1_test_666_status
@@ -1,5 +1,5 @@
 <entry xmlns="http://www.w3.org/2005/Atom"
-       xmlns:sword="http://purl.org/net/sword/"
+       xmlns:sword="http://purl.org/net/sword/terms/"
        xmlns:dcterms="http://purl.org/dc/terms/">
     <deposit_id>666</deposit_id>
     <deposit_status>partial</deposit_status>
diff --git a/swh/deposit/tests/data/https_deposit.test.status/1_test_1033_status b/swh/deposit/tests/data/https_deposit.test.status/1_test_1033_status
--- a/swh/deposit/tests/data/https_deposit.test.status/1_test_1033_status
+++ b/swh/deposit/tests/data/https_deposit.test.status/1_test_1033_status
@@ -1,5 +1,5 @@
 <entry xmlns="http://www.w3.org/2005/Atom"
-       xmlns:sword="http://purl.org/net/sword/"
+       xmlns:sword="http://purl.org/net/sword/terms/"
        xmlns:dcterms="http://purl.org/dc/terms/">
     <deposit_id>1033</deposit_id>
     <deposit_status>done</deposit_status>
diff --git a/swh/deposit/tests/data/https_deposit.test.updateswhid/1_test_123_metadata b/swh/deposit/tests/data/https_deposit.test.updateswhid/1_test_123_metadata
--- a/swh/deposit/tests/data/https_deposit.test.updateswhid/1_test_123_metadata
+++ b/swh/deposit/tests/data/https_deposit.test.updateswhid/1_test_123_metadata
@@ -1,5 +1,5 @@
 <entry xmlns="http://www.w3.org/2005/Atom"
-       xmlns:sword="http://purl.org/net/sword/"
+       xmlns:sword="http://purl.org/net/sword/terms/"
        xmlns:dcterms="http://purl.org/dc/terms/">
     <deposit_id>123</deposit_id>
     <deposit_status>done</deposit_status>
diff --git a/swh/deposit/tests/data/https_deposit.test.updateswhid/1_test_123_status b/swh/deposit/tests/data/https_deposit.test.updateswhid/1_test_123_status
--- a/swh/deposit/tests/data/https_deposit.test.updateswhid/1_test_123_status
+++ b/swh/deposit/tests/data/https_deposit.test.updateswhid/1_test_123_status
@@ -1,5 +1,5 @@
 <entry xmlns="http://www.w3.org/2005/Atom"
-       xmlns:sword="http://purl.org/net/sword/"
+       xmlns:sword="http://purl.org/net/sword/terms/"
        xmlns:dcterms="http://purl.org/dc/terms/">
     <deposit_id>123</deposit_id>
     <deposit_status>done</deposit_status>
diff --git a/swh/deposit/tests/data/https_deposit.test.updateswhid/1_test_321_status b/swh/deposit/tests/data/https_deposit.test.updateswhid/1_test_321_status
--- a/swh/deposit/tests/data/https_deposit.test.updateswhid/1_test_321_status
+++ b/swh/deposit/tests/data/https_deposit.test.updateswhid/1_test_321_status
@@ -1,5 +1,5 @@
 <entry xmlns="http://www.w3.org/2005/Atom"
-       xmlns:sword="http://purl.org/net/sword/"
+       xmlns:sword="http://purl.org/net/sword/terms/"
        xmlns:dcterms="http://purl.org/dc/terms/">
     <deposit_id>321</deposit_id>
     <deposit_status>partial</deposit_status>
diff --git a/swh/deposit/utils.py b/swh/deposit/utils.py
--- a/swh/deposit/utils.py
+++ b/swh/deposit/utils.py
@@ -18,7 +18,7 @@
         "http://www.w3.org/2005/Atom": None,
         "http://purl.org/dc/terms/": None,
         "https://doi.org/10.5063/SCHEMA/CODEMETA-2.0": "codemeta",
-        "http://purl.org/net/sword/": "sword",
+        "http://purl.org/net/sword/terms/": "sword",
         "https://www.softwareheritage.org/schema/2018/deposit": "swh",
     }