diff --git a/builtin/schemes.gen.go b/builtin/schemes.gen.go
index 26f5f3a6..0cd446b5 100644
--- a/builtin/schemes.gen.go
+++ b/builtin/schemes.gen.go
@@ -5,7 +5,7 @@ import (
 
 	scheme1 "github.com/veraison/services/scheme/cca-ssd-platform"
 	scheme4 "github.com/veraison/services/scheme/psa-iot"
-	scheme2 "github.com/veraison/services/scheme/tcg-dice"
+	scheme2 "github.com/veraison/services/scheme/riot"
 	scheme3 "github.com/veraison/services/scheme/tpm-enacttrust"
 )
 
diff --git a/scheme/Makefile b/scheme/Makefile
index 464d0ece..7771f757 100644
--- a/scheme/Makefile
+++ b/scheme/Makefile
@@ -3,7 +3,7 @@
 
 SUBDIR := common
 SUBDIR += cca-ssd-platform
-SUBDIR += tcg-dice
+SUBDIR += riot
 SUBDIR += psa-iot
 SUBDIR += tpm-enacttrust
 SUBDIR += parsec-tpm
diff --git a/scheme/README.md b/scheme/README.md
index 3c340b97..d7ea8b5e 100644
--- a/scheme/README.md
+++ b/scheme/README.md
@@ -3,8 +3,7 @@ schemes. Currently the following schemes are implemented:
 
 - `cca-ssd-platform` Arm Confidential Compute Architecture attestation.
 - `psa-iot`: Arm Platform Security Architecture attestation.
-- `tcg-dice`: [TCG
-  DICE](https://trustedcomputinggroup.org/work-groups/dice-architectures/)-compatible
+- `riot`: [RIoT based DICE](https://trustedcomputinggroup.org/work-groups/dice-architectures/)-compatible
   attestation (note: this does not implement any specific DICE architecture).
 - `tmp-enacttrust`: TPM-based attestation for
   [EnactTrust](https://www.enacttrust.com/) security cloud.
diff --git a/scheme/tcg-dice/Makefile b/scheme/riot/Makefile
similarity index 84%
rename from scheme/tcg-dice/Makefile
rename to scheme/riot/Makefile
index 434310e3..3fd7c3ea 100644
--- a/scheme/tcg-dice/Makefile
+++ b/scheme/riot/Makefile
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 .DEFAULT_GOAL := test
 
-GOPKG := github.com/veraison/services/scheme/tcg-dice
+GOPKG := github.com/veraison/services/scheme/riot
 SRCS := $(wildcard *.go)
 
 SUBDIR += plugin
diff --git a/scheme/tcg-dice/evidence_handler.go b/scheme/riot/evidence_handler.go
similarity index 99%
rename from scheme/tcg-dice/evidence_handler.go
rename to scheme/riot/evidence_handler.go
index 89da14db..35caee71 100644
--- a/scheme/tcg-dice/evidence_handler.go
+++ b/scheme/riot/evidence_handler.go
@@ -1,7 +1,7 @@
 // Copyright 2021-2023 Contributors to the Veraison project.
 // SPDX-License-Identifier: Apache-2.0
 
-package tcg_dice
+package riot
 
 import (
 	"crypto/x509"
@@ -22,7 +22,7 @@ type EvidenceHandler struct {
 }
 
 func (s EvidenceHandler) GetName() string {
-	return "tcg-dice-evidence-handler"
+	return "riot-evidence-handler"
 }
 
 func (s EvidenceHandler) GetAttestationScheme() string {
diff --git a/scheme/tcg-dice/evidence_handler_test.go b/scheme/riot/evidence_handler_test.go
similarity index 98%
rename from scheme/tcg-dice/evidence_handler_test.go
rename to scheme/riot/evidence_handler_test.go
index c260a4af..02ba9870 100644
--- a/scheme/tcg-dice/evidence_handler_test.go
+++ b/scheme/riot/evidence_handler_test.go
@@ -1,7 +1,7 @@
 // Copyright 2021-2023 Contributors to the Veraison project.
 // SPDX-License-Identifier: Apache-2.0
 
-package tcg_dice
+package riot
 
 import (
 	"os"
diff --git a/scheme/tcg-dice/plugin/Makefile b/scheme/riot/plugin/Makefile
similarity index 100%
rename from scheme/tcg-dice/plugin/Makefile
rename to scheme/riot/plugin/Makefile
diff --git a/scheme/tcg-dice/plugin/combined/Makefile b/scheme/riot/plugin/combined/Makefile
similarity index 71%
rename from scheme/tcg-dice/plugin/combined/Makefile
rename to scheme/riot/plugin/combined/Makefile
index c64147c0..d3387928 100644
--- a/scheme/tcg-dice/plugin/combined/Makefile
+++ b/scheme/riot/plugin/combined/Makefile
@@ -1,8 +1,8 @@
 # Copyright 2021 Contributors to the Veraison project.
 # SPDX-License-Identifier: Apache-2.0
 
-PLUGIN := ../../../bin/tcg-dice.plugin
-GOPKG := github.com/veraison/services/scheme/tcg-dice
+PLUGIN := ../../../bin/riot.plugin
+GOPKG := github.com/veraison/services/scheme/riot
 SRCS := main.go
 
 include ../../../../mk/common.mk
diff --git a/scheme/tcg-dice/plugin/combined/main.go b/scheme/riot/plugin/combined/main.go
similarity index 84%
rename from scheme/tcg-dice/plugin/combined/main.go
rename to scheme/riot/plugin/combined/main.go
index eb992bf6..983a9704 100644
--- a/scheme/tcg-dice/plugin/combined/main.go
+++ b/scheme/riot/plugin/combined/main.go
@@ -5,7 +5,7 @@ package main
 import (
 	"github.com/veraison/services/handler"
 	"github.com/veraison/services/plugin"
-	scheme "github.com/veraison/services/scheme/tcg-dice"
+	scheme "github.com/veraison/services/scheme/riot"
 )
 
 func main() {
diff --git a/scheme/tcg-dice/plugin/evidence-handler/Makefile b/scheme/riot/plugin/evidence-handler/Makefile
similarity index 100%
rename from scheme/tcg-dice/plugin/evidence-handler/Makefile
rename to scheme/riot/plugin/evidence-handler/Makefile
diff --git a/scheme/tcg-dice/plugin/evidence-handler/main.go b/scheme/riot/plugin/evidence-handler/main.go
similarity index 84%
rename from scheme/tcg-dice/plugin/evidence-handler/main.go
rename to scheme/riot/plugin/evidence-handler/main.go
index 949317b5..3c5944ce 100644
--- a/scheme/tcg-dice/plugin/evidence-handler/main.go
+++ b/scheme/riot/plugin/evidence-handler/main.go
@@ -5,7 +5,7 @@ package main
 import (
 	"github.com/veraison/services/handler"
 	"github.com/veraison/services/plugin"
-	scheme "github.com/veraison/services/scheme/tcg-dice"
+	scheme "github.com/veraison/services/scheme/riot"
 )
 
 func main() {
diff --git a/scheme/tcg-dice/scheme.go b/scheme/riot/scheme.go
similarity index 78%
rename from scheme/tcg-dice/scheme.go
rename to scheme/riot/scheme.go
index 176f55bb..31c961f6 100644
--- a/scheme/tcg-dice/scheme.go
+++ b/scheme/riot/scheme.go
@@ -1,8 +1,8 @@
 // Copyright 2023 Contributors to the Veraison project.
 // SPDX-License-Identifier: Apache-2.0
-package tcg_dice
+package riot
 
-const SchemeName = "TCG_DICE"
+const SchemeName = "riot"
 
 var EvidenceMediaTypes = []string{
 	"application/pem-certificate-chain",
diff --git a/scheme/tcg-dice/test/DeviceCerts.pem b/scheme/riot/test/DeviceCerts.pem
similarity index 100%
rename from scheme/tcg-dice/test/DeviceCerts.pem
rename to scheme/riot/test/DeviceCerts.pem
diff --git a/scheme/tcg-dice/test/TrustAnchor.pem b/scheme/riot/test/TrustAnchor.pem
similarity index 100%
rename from scheme/tcg-dice/test/TrustAnchor.pem
rename to scheme/riot/test/TrustAnchor.pem