diff --git a/src/github.com/matrix-org/dendrite/clientapi/auth/storage/devices/devices_table.go b/src/github.com/matrix-org/dendrite/clientapi/auth/storage/devices/devices_table.go
index feae7f2ff..a614eb541 100644
--- a/src/github.com/matrix-org/dendrite/clientapi/auth/storage/devices/devices_table.go
+++ b/src/github.com/matrix-org/dendrite/clientapi/auth/storage/devices/devices_table.go
@@ -154,14 +154,14 @@ func (s *devicesStatements) selectDeviceByToken(
 }
 
 func (s *devicesStatements) selectDeviceByID(
-	ctx context.Context, localpart, device_id string,
+	ctx context.Context, localpart, deviceID string,
 ) (*authtypes.Device, error) {
 	var dev authtypes.Device
 	var created int64
 	stmt := s.selectDeviceByIDStmt
-	err := stmt.QueryRowContext(ctx, localpart, device_id).Scan(&created)
+	err := stmt.QueryRowContext(ctx, localpart, deviceID).Scan(&created)
 	if err == nil {
-		dev.ID = device_id
+		dev.ID = deviceID
 		dev.UserID = makeUserID(localpart, s.serverName)
 	}
 	return &dev, err
diff --git a/src/github.com/matrix-org/dendrite/clientapi/auth/storage/devices/storage.go b/src/github.com/matrix-org/dendrite/clientapi/auth/storage/devices/storage.go
index a1f4b8915..dd98bb609 100644
--- a/src/github.com/matrix-org/dendrite/clientapi/auth/storage/devices/storage.go
+++ b/src/github.com/matrix-org/dendrite/clientapi/auth/storage/devices/storage.go
@@ -55,9 +55,9 @@ func (d *Database) GetDeviceByAccessToken(
 // GetDeviceByID returns the device matching the given ID.
 // Returns sql.ErrNoRows if no matching device was found.
 func (d *Database) GetDeviceByID(
-	ctx context.Context, localpart, device_id string,
+	ctx context.Context, localpart, deviceID string,
 ) (*authtypes.Device, error) {
-	return d.devices.selectDeviceByID(ctx, localpart, device_id)
+	return d.devices.selectDeviceByID(ctx, localpart, deviceID)
 }
 
 // GetDevicesByLocalpart returns the devices matching the given localpart.
diff --git a/src/github.com/matrix-org/dendrite/clientapi/routing/device.go b/src/github.com/matrix-org/dendrite/clientapi/routing/device.go
index 3bc4df0e3..9cb63bac9 100644
--- a/src/github.com/matrix-org/dendrite/clientapi/routing/device.go
+++ b/src/github.com/matrix-org/dendrite/clientapi/routing/device.go
@@ -38,7 +38,7 @@ type devicesJSON struct {
 // GetDeviceByID handles /device/{deviceID}
 func GetDeviceByID(
 	req *http.Request, deviceDB *devices.Database, device *authtypes.Device,
-	device_id string,
+	deviceID string,
 ) util.JSONResponse {
 	localpart, _, err := gomatrixserverlib.SplitID('@', device.UserID)
 	if err != nil {
@@ -46,7 +46,7 @@ func GetDeviceByID(
 	}
 
 	ctx := req.Context()
-	dev, err := deviceDB.GetDeviceByID(ctx, localpart, device_id)
+	dev, err := deviceDB.GetDeviceByID(ctx, localpart, deviceID)
 	if err == sql.ErrNoRows {
 		return util.JSONResponse{
 			Code: 404,