diff --git a/src/github.com/matrix-org/dendrite/cmd/clientapi/main.go b/src/github.com/matrix-org/dendrite/cmd/dendrite-clientapi/main.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/cmd/clientapi/main.go
rename to src/github.com/matrix-org/dendrite/cmd/dendrite-clientapi/main.go
diff --git a/src/github.com/matrix-org/dendrite/cmd/roomserver/main.go b/src/github.com/matrix-org/dendrite/dendrite-roomserver/main.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/cmd/roomserver/main.go
rename to src/github.com/matrix-org/dendrite/dendrite-roomserver/main.go
diff --git a/travis-test.sh b/travis-test.sh
index bf19612cc..96a92df98 100755
--- a/travis-test.sh
+++ b/travis-test.sh
@@ -3,7 +3,7 @@
 set -eu
 
 # Check that the servers build
-gb build github.com/matrix-org/dendrite/cmd/roomserver
+gb build github.com/matrix-org/dendrite/cmd/dendrite-roomserver
 gb build github.com/matrix-org/dendrite/cmd/roomserver-integration-tests
 
 # Run the pre commit hooks