diff --git a/cmd/dendrite-p2p-demo/main.go b/cmd/dendrite-demo-libp2p/main.go
similarity index 99%
rename from cmd/dendrite-p2p-demo/main.go
rename to cmd/dendrite-demo-libp2p/main.go
index c75821cb8..33f413aa2 100644
--- a/cmd/dendrite-p2p-demo/main.go
+++ b/cmd/dendrite-demo-libp2p/main.go
@@ -29,7 +29,7 @@ import (
 	"github.com/matrix-org/dendrite/appservice"
 	"github.com/matrix-org/dendrite/clientapi"
 	"github.com/matrix-org/dendrite/clientapi/producers"
-	"github.com/matrix-org/dendrite/cmd/dendrite-p2p-demo/storage"
+	"github.com/matrix-org/dendrite/cmd/dendrite-demo-libp2p/storage"
 	"github.com/matrix-org/dendrite/common"
 	"github.com/matrix-org/dendrite/common/config"
 	"github.com/matrix-org/dendrite/common/keydb"
diff --git a/cmd/dendrite-p2p-demo/mdnslistener.go b/cmd/dendrite-demo-libp2p/mdnslistener.go
similarity index 100%
rename from cmd/dendrite-p2p-demo/mdnslistener.go
rename to cmd/dendrite-demo-libp2p/mdnslistener.go
diff --git a/cmd/dendrite-p2p-demo/p2pdendrite.go b/cmd/dendrite-demo-libp2p/p2pdendrite.go
similarity index 100%
rename from cmd/dendrite-p2p-demo/p2pdendrite.go
rename to cmd/dendrite-demo-libp2p/p2pdendrite.go
diff --git a/cmd/dendrite-p2p-demo/storage/postgreswithdht/storage.go b/cmd/dendrite-demo-libp2p/storage/postgreswithdht/storage.go
similarity index 100%
rename from cmd/dendrite-p2p-demo/storage/postgreswithdht/storage.go
rename to cmd/dendrite-demo-libp2p/storage/postgreswithdht/storage.go
diff --git a/cmd/dendrite-p2p-demo/storage/postgreswithpubsub/storage.go b/cmd/dendrite-demo-libp2p/storage/postgreswithpubsub/storage.go
similarity index 100%
rename from cmd/dendrite-p2p-demo/storage/postgreswithpubsub/storage.go
rename to cmd/dendrite-demo-libp2p/storage/postgreswithpubsub/storage.go
diff --git a/cmd/dendrite-p2p-demo/storage/storage.go b/cmd/dendrite-demo-libp2p/storage/storage.go
similarity index 92%
rename from cmd/dendrite-p2p-demo/storage/storage.go
rename to cmd/dendrite-demo-libp2p/storage/storage.go
index 9cd8c403b..668edbaa3 100644
--- a/cmd/dendrite-p2p-demo/storage/storage.go
+++ b/cmd/dendrite-demo-libp2p/storage/storage.go
@@ -19,8 +19,8 @@ import (
 
 	dht "github.com/libp2p/go-libp2p-kad-dht"
 	pubsub "github.com/libp2p/go-libp2p-pubsub"
-	"github.com/matrix-org/dendrite/cmd/dendrite-p2p-demo/storage/postgreswithdht"
-	"github.com/matrix-org/dendrite/cmd/dendrite-p2p-demo/storage/postgreswithpubsub"
+	"github.com/matrix-org/dendrite/cmd/dendrite-demo-libp2p/storage/postgreswithdht"
+	"github.com/matrix-org/dendrite/cmd/dendrite-demo-libp2p/storage/postgreswithpubsub"
 	"github.com/matrix-org/dendrite/publicroomsapi/storage"
 	"github.com/matrix-org/dendrite/publicroomsapi/storage/sqlite3"
 )