diff --git a/api.go b/api.go
index c622527..3cf18a8 100644
--- a/api.go
+++ b/api.go
@@ -46,7 +46,7 @@ func (a *Api) handleTunnels(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	tokenData, exists := a.db.GetTokenData(token)
+	tokenData, exists := a.db.GetLegacyTokenData(token)
 	if !exists {
 		w.WriteHeader(403)
 		w.Write([]byte("Not authorized"))
@@ -141,7 +141,7 @@ func (a *Api) handleUsers(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	tokenData, exists := a.db.GetTokenData(token)
+	tokenData, exists := a.db.GetLegacyTokenData(token)
 	if !exists {
 		w.WriteHeader(401)
 		io.WriteString(w, "Failed to get token")
@@ -179,7 +179,7 @@ func (a *Api) handleTokens(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	tokenData, exists := a.db.GetTokenData(token)
+	tokenData, exists := a.db.GetLegacyTokenData(token)
 	if !exists {
 		w.WriteHeader(403)
 		w.Write([]byte("Not authorized"))
@@ -219,7 +219,7 @@ func (a *Api) handleClients(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	tokenData, exists := a.db.GetTokenData(token)
+	tokenData, exists := a.db.GetLegacyTokenData(token)
 	if !exists {
 		w.WriteHeader(403)
 		w.Write([]byte("Not authorized"))
@@ -478,7 +478,7 @@ func (a *Api) DeleteToken(tokenData TokenData, params url.Values) error {
 		return errors.New("Invalid token parameter")
 	}
 
-	delTokenData, exists := a.db.GetTokenData(token)
+	delTokenData, exists := a.db.GetLegacyTokenData(token)
 	if !exists {
 		return errors.New("Token doesn't exist")
 	}
diff --git a/auth.go b/auth.go
index 5bd046d..e3e1ed9 100644
--- a/auth.go
+++ b/auth.go
@@ -23,7 +23,7 @@ func NewAuth(db *Database) *Auth {
 }
 
 func (a *Auth) Authorized(token string) bool {
-	_, exists := a.db.GetTokenData(token)
+	_, exists := a.db.GetLegacyTokenData(token)
 
 	if exists {
 		return true
diff --git a/database.go b/database.go
index 47c4132..7c77d4b 100644
--- a/database.go
+++ b/database.go
@@ -20,7 +20,7 @@ type Database struct {
 	Users         map[string]User                `json:"users"`
 	dnsRequests   map[string]namedrop.DNSRequest `json:"dns_requests"`
 	Waygates      map[string]waygate.Waygate     `json:"waygates"`
-	WaygateTokens map[string]waygate.Token       `json:"waygate_tokens"`
+	WaygateTokens map[string]waygate.TokenData   `json:"waygate_tokens"`
 	waygateCodes  map[string]string              `json:"waygate_codes"`
 	mutex         *sync.Mutex
 }
@@ -104,7 +104,7 @@ func NewDatabase(path string) (*Database, error) {
 		db.Waygates = make(map[string]waygate.Waygate)
 	}
 	if db.WaygateTokens == nil {
-		db.WaygateTokens = make(map[string]waygate.Token)
+		db.WaygateTokens = make(map[string]waygate.TokenData)
 	}
 	if db.waygateCodes == nil {
 		db.waygateCodes = make(map[string]string)
@@ -198,7 +198,7 @@ func (d *Database) GetTokens() map[string]TokenData {
 	return tokens
 }
 
-func (d *Database) GetTokenData(token string) (TokenData, bool) {
+func (d *Database) GetLegacyTokenData(token string) (TokenData, bool) {
 	d.mutex.Lock()
 	defer d.mutex.Unlock()
 
@@ -357,7 +357,7 @@ func (d *Database) AddWaygateTunnel(domains []string) (string, error) {
 
 	return id, nil
 }
-func (d *Database) GetWaygateTunnel(id string) (waygate.Waygate, error) {
+func (d *Database) GetWaygate(id string) (waygate.Waygate, error) {
 	d.mutex.Lock()
 	defer d.mutex.Unlock()
 
@@ -395,7 +395,7 @@ func (d *Database) AddWaygateToken(waygateId string) (string, error) {
 		return "", errors.New("No such waygate")
 	}
 
-	tokenData := waygate.Token{
+	tokenData := waygate.TokenData{
 		WaygateId: waygateId,
 	}
 
@@ -405,13 +405,13 @@ func (d *Database) AddWaygateToken(waygateId string) (string, error) {
 
 	return token, nil
 }
-func (d *Database) GetWaygateToken(id string) (waygate.Token, error) {
+func (d *Database) GetTokenData(id string) (waygate.TokenData, error) {
 	d.mutex.Lock()
 	defer d.mutex.Unlock()
 
 	token, exists := d.WaygateTokens[id]
 	if !exists {
-		return waygate.Token{}, errors.New("No such token")
+		return waygate.TokenData{}, errors.New("No such token")
 	}
 
 	return token, nil
diff --git a/ui_handler.go b/ui_handler.go
index 734a914..cc0a50f 100644
--- a/ui_handler.go
+++ b/ui_handler.go
@@ -85,7 +85,7 @@ func (h *WebUiHandler) handleWebUiRequest(w http.ResponseWriter, r *http.Request
 		return
 	}
 
-	tokenData, exists := h.db.GetTokenData(token)
+	tokenData, exists := h.db.GetLegacyTokenData(token)
 	if !exists {
 		h.sendLoginPage(w, r, 403)
 		return