diff --git a/src/github.com/matrix-org/dendrite/cmd/dendrite-sync-api-server/main.go b/src/github.com/matrix-org/dendrite/cmd/dendrite-sync-api-server/main.go
index fe74679a4..2bbc0c275 100644
--- a/src/github.com/matrix-org/dendrite/cmd/dendrite-sync-api-server/main.go
+++ b/src/github.com/matrix-org/dendrite/cmd/dendrite-sync-api-server/main.go
@@ -7,11 +7,11 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/matrix-org/dendrite/syncserver/config"
-	"github.com/matrix-org/dendrite/syncserver/consumers"
-	"github.com/matrix-org/dendrite/syncserver/routing"
-	"github.com/matrix-org/dendrite/syncserver/storage"
-	"github.com/matrix-org/dendrite/syncserver/sync"
+	"github.com/matrix-org/dendrite/syncapi/config"
+	"github.com/matrix-org/dendrite/syncapi/consumers"
+	"github.com/matrix-org/dendrite/syncapi/routing"
+	"github.com/matrix-org/dendrite/syncapi/storage"
+	"github.com/matrix-org/dendrite/syncapi/sync"
 
 	log "github.com/Sirupsen/logrus"
 	"github.com/matrix-org/dugong"
diff --git a/src/github.com/matrix-org/dendrite/syncserver/README.md b/src/github.com/matrix-org/dendrite/syncapi/README.md
similarity index 99%
rename from src/github.com/matrix-org/dendrite/syncserver/README.md
rename to src/github.com/matrix-org/dendrite/syncapi/README.md
index 1fc62b376..7ead4cd1a 100644
--- a/src/github.com/matrix-org/dendrite/syncserver/README.md
+++ b/src/github.com/matrix-org/dendrite/syncapi/README.md
@@ -1,4 +1,4 @@
-# Sync Server
+# Sync API Server
 
 This server is responsible for servicing `/sync` requests. It gets its data from the room server output log.
 
diff --git a/src/github.com/matrix-org/dendrite/syncserver/config/config.go b/src/github.com/matrix-org/dendrite/syncapi/config/config.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/syncserver/config/config.go
rename to src/github.com/matrix-org/dendrite/syncapi/config/config.go
diff --git a/src/github.com/matrix-org/dendrite/syncserver/consumers/roomserver.go b/src/github.com/matrix-org/dendrite/syncapi/consumers/roomserver.go
similarity index 92%
rename from src/github.com/matrix-org/dendrite/syncserver/consumers/roomserver.go
rename to src/github.com/matrix-org/dendrite/syncapi/consumers/roomserver.go
index 8e5fe0ffd..da75aff02 100644
--- a/src/github.com/matrix-org/dendrite/syncserver/consumers/roomserver.go
+++ b/src/github.com/matrix-org/dendrite/syncapi/consumers/roomserver.go
@@ -6,10 +6,10 @@ import (
 	log "github.com/Sirupsen/logrus"
 	"github.com/matrix-org/dendrite/common"
 	"github.com/matrix-org/dendrite/roomserver/api"
-	"github.com/matrix-org/dendrite/syncserver/config"
-	"github.com/matrix-org/dendrite/syncserver/storage"
-	"github.com/matrix-org/dendrite/syncserver/sync"
-	"github.com/matrix-org/dendrite/syncserver/types"
+	"github.com/matrix-org/dendrite/syncapi/config"
+	"github.com/matrix-org/dendrite/syncapi/storage"
+	"github.com/matrix-org/dendrite/syncapi/sync"
+	"github.com/matrix-org/dendrite/syncapi/types"
 	"github.com/matrix-org/gomatrixserverlib"
 	sarama "gopkg.in/Shopify/sarama.v1"
 )
diff --git a/src/github.com/matrix-org/dendrite/syncserver/routing/routing.go b/src/github.com/matrix-org/dendrite/syncapi/routing/routing.go
similarity index 90%
rename from src/github.com/matrix-org/dendrite/syncserver/routing/routing.go
rename to src/github.com/matrix-org/dendrite/syncapi/routing/routing.go
index c6171fff4..4ce410230 100644
--- a/src/github.com/matrix-org/dendrite/syncserver/routing/routing.go
+++ b/src/github.com/matrix-org/dendrite/syncapi/routing/routing.go
@@ -4,8 +4,8 @@ import (
 	"net/http"
 
 	"github.com/gorilla/mux"
-	"github.com/matrix-org/dendrite/syncserver/config"
-	"github.com/matrix-org/dendrite/syncserver/sync"
+	"github.com/matrix-org/dendrite/syncapi/config"
+	"github.com/matrix-org/dendrite/syncapi/sync"
 	"github.com/matrix-org/util"
 	"github.com/prometheus/client_golang/prometheus"
 )
diff --git a/src/github.com/matrix-org/dendrite/syncserver/storage/current_room_state_table.go b/src/github.com/matrix-org/dendrite/syncapi/storage/current_room_state_table.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/syncserver/storage/current_room_state_table.go
rename to src/github.com/matrix-org/dendrite/syncapi/storage/current_room_state_table.go
diff --git a/src/github.com/matrix-org/dendrite/syncserver/storage/output_room_events_table.go b/src/github.com/matrix-org/dendrite/syncapi/storage/output_room_events_table.go
similarity index 99%
rename from src/github.com/matrix-org/dendrite/syncserver/storage/output_room_events_table.go
rename to src/github.com/matrix-org/dendrite/syncapi/storage/output_room_events_table.go
index 0a873c4ee..c3c58eddc 100644
--- a/src/github.com/matrix-org/dendrite/syncserver/storage/output_room_events_table.go
+++ b/src/github.com/matrix-org/dendrite/syncapi/storage/output_room_events_table.go
@@ -6,7 +6,7 @@ import (
 
 	log "github.com/Sirupsen/logrus"
 	"github.com/lib/pq"
-	"github.com/matrix-org/dendrite/syncserver/types"
+	"github.com/matrix-org/dendrite/syncapi/types"
 	"github.com/matrix-org/gomatrixserverlib"
 )
 
diff --git a/src/github.com/matrix-org/dendrite/syncserver/storage/syncserver.go b/src/github.com/matrix-org/dendrite/syncapi/storage/syncserver.go
similarity index 99%
rename from src/github.com/matrix-org/dendrite/syncserver/storage/syncserver.go
rename to src/github.com/matrix-org/dendrite/syncapi/storage/syncserver.go
index 61bcbe110..c65b72066 100644
--- a/src/github.com/matrix-org/dendrite/syncserver/storage/syncserver.go
+++ b/src/github.com/matrix-org/dendrite/syncapi/storage/syncserver.go
@@ -5,7 +5,7 @@ import (
 	// Import the postgres database driver.
 	_ "github.com/lib/pq"
 	"github.com/matrix-org/dendrite/common"
-	"github.com/matrix-org/dendrite/syncserver/types"
+	"github.com/matrix-org/dendrite/syncapi/types"
 	"github.com/matrix-org/gomatrixserverlib"
 )
 
diff --git a/src/github.com/matrix-org/dendrite/syncserver/sync/request.go b/src/github.com/matrix-org/dendrite/syncapi/sync/request.go
similarity index 96%
rename from src/github.com/matrix-org/dendrite/syncserver/sync/request.go
rename to src/github.com/matrix-org/dendrite/syncapi/sync/request.go
index 40108a2b8..a7cf44e6f 100644
--- a/src/github.com/matrix-org/dendrite/syncserver/sync/request.go
+++ b/src/github.com/matrix-org/dendrite/syncapi/sync/request.go
@@ -1,7 +1,7 @@
 package sync
 
 import (
-	"github.com/matrix-org/dendrite/syncserver/types"
+	"github.com/matrix-org/dendrite/syncapi/types"
 	"net/http"
 	"strconv"
 	"time"
diff --git a/src/github.com/matrix-org/dendrite/syncserver/sync/requestpool.go b/src/github.com/matrix-org/dendrite/syncapi/sync/requestpool.go
similarity index 97%
rename from src/github.com/matrix-org/dendrite/syncserver/sync/requestpool.go
rename to src/github.com/matrix-org/dendrite/syncapi/sync/requestpool.go
index f3f7bb236..eff24fb06 100644
--- a/src/github.com/matrix-org/dendrite/syncserver/sync/requestpool.go
+++ b/src/github.com/matrix-org/dendrite/syncapi/sync/requestpool.go
@@ -9,8 +9,8 @@ import (
 	"github.com/matrix-org/dendrite/clientapi/auth"
 	"github.com/matrix-org/dendrite/clientapi/httputil"
 	"github.com/matrix-org/dendrite/clientapi/jsonerror"
-	"github.com/matrix-org/dendrite/syncserver/storage"
-	"github.com/matrix-org/dendrite/syncserver/types"
+	"github.com/matrix-org/dendrite/syncapi/storage"
+	"github.com/matrix-org/dendrite/syncapi/types"
 	"github.com/matrix-org/gomatrixserverlib"
 	"github.com/matrix-org/util"
 )
diff --git a/src/github.com/matrix-org/dendrite/syncserver/types/types.go b/src/github.com/matrix-org/dendrite/syncapi/types/types.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/syncserver/types/types.go
rename to src/github.com/matrix-org/dendrite/syncapi/types/types.go