diff --git a/core/loadpoint_phases.go b/core/loadpoint_phases.go
index f0e9bbb37..ec508e2d0 100644
--- a/core/loadpoint_phases.go
+++ b/core/loadpoint_phases.go
@@ -143,8 +143,8 @@ func (lp *Loadpoint) maxActivePhases() int {
 }
 
 func (lp *Loadpoint) getVehiclePhases() int {
-	if vehicle := lp.GetVehicle(); vehicle != nil {
-		return vehicle.Phases()
+	if v := lp.GetVehicle(); v != nil {
+		return v.Phases()
 	}
 
 	return 0
diff --git a/core/loadpoint_session.go b/core/loadpoint_session.go
index 86a0278d0..6cf124b99 100644
--- a/core/loadpoint_session.go
+++ b/core/loadpoint_session.go
@@ -36,8 +36,8 @@ func (lp *Loadpoint) createSession() {
 
 	lp.session = lp.db.New(lp.chargeMeterTotal())
 
-	if vehicle := lp.GetVehicle(); vehicle != nil {
-		lp.session.Vehicle = vehicle.GetTitle()
+	if v := lp.GetVehicle(); v != nil {
+		lp.session.Vehicle = v.GetTitle()
 	} else if lp.chargerHasFeature(api.IntegratedDevice) {
 		lp.session.Vehicle = lp.GetTitle()
 	}