diff --git a/scheme/tcg-dice/Makefile b/scheme/riot/Makefile
similarity index 100%
rename from scheme/tcg-dice/Makefile
rename to scheme/riot/Makefile
diff --git a/scheme/tcg-dice/evidence_handler.go b/scheme/riot/evidence_handler.go
similarity index 100%
rename from scheme/tcg-dice/evidence_handler.go
rename to scheme/riot/evidence_handler.go
diff --git a/scheme/tcg-dice/evidence_handler_test.go b/scheme/riot/evidence_handler_test.go
similarity index 100%
rename from scheme/tcg-dice/evidence_handler_test.go
rename to scheme/riot/evidence_handler_test.go
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 100%
rename from scheme/tcg-dice/plugin/combined/Makefile
rename to scheme/riot/plugin/combined/Makefile
diff --git a/scheme/tcg-dice/plugin/combined/main.go b/scheme/riot/plugin/combined/main.go
similarity index 100%
rename from scheme/tcg-dice/plugin/combined/main.go
rename to scheme/riot/plugin/combined/main.go
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 100%
rename from scheme/tcg-dice/plugin/evidence-handler/main.go
rename to scheme/riot/plugin/evidence-handler/main.go
diff --git a/scheme/tcg-dice/scheme.go b/scheme/riot/scheme.go
similarity index 100%
rename from scheme/tcg-dice/scheme.go
rename to scheme/riot/scheme.go
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