diff --git a/src/Bundle/ChillMainBundle/Entity/User.php b/src/Bundle/ChillMainBundle/Entity/User.php
index 2d87bcaf1..c6fd42859 100644
--- a/src/Bundle/ChillMainBundle/Entity/User.php
+++ b/src/Bundle/ChillMainBundle/Entity/User.php
@@ -143,7 +143,7 @@ class User implements AdvancedUserInterface {
      * @var Location|null
      * @ORM\ManyToOne(targetEntity=Location::class)
      */
-    private ?Location $location = null;
+    private ?Location $currentLocation = null;
 
     /**
      * User constructor.
@@ -496,18 +496,18 @@ class User implements AdvancedUserInterface {
     /**
      * @return Location|null
      */
-    public function getLocation(): ?Location
+    public function getCurrentLocation(): ?Location
     {
-        return $this->location;
+        return $this->currentLocation;
     }
 
     /**
      * @param Location|null $location
      * @return User
      */
-    public function setLocation(?Location $location): User
+    public function setCurrentLocation(?Location $currentLocation): User
     {
-        $this->location = $location;
+        $this->currentLocation = $currentLocation;
         return $this;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20211116162847.php b/src/Bundle/ChillMainBundle/migrations/Version20211116162847.php
index 3971841c7..04680b381 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20211116162847.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20211116162847.php
@@ -8,26 +8,26 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add location to User entity
+ * Add current location to User entity
  */
 final class Version20211116162847 extends AbstractMigration
 {
     public function getDescription(): string
     {
-        return 'Add location to User entity';
+        return 'Add current location to User entity';
     }
 
     public function up(Schema $schema): void
     {
-        $this->addSql('ALTER TABLE users ADD location_id INT DEFAULT NULL');
-        $this->addSql('ALTER TABLE users ADD CONSTRAINT FK_1483A5E964D218E FOREIGN KEY (location_id) REFERENCES chill_main_location (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('CREATE INDEX IDX_1483A5E964D218E ON users (location_id)');
+        $this->addSql('ALTER TABLE users ADD currentLocation_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE users ADD CONSTRAINT FK_1483A5E93C219753 FOREIGN KEY (currentLocation_id) REFERENCES chill_main_location (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('CREATE INDEX IDX_1483A5E93C219753 ON users (currentLocation_id)');
     }
 
     public function down(Schema $schema): void
     {
-        $this->addSql('ALTER TABLE users DROP CONSTRAINT FK_1483A5E964D218E');
-        $this->addSql('DROP INDEX IDX_1483A5E964D218E');
-        $this->addSql('ALTER TABLE users DROP location_id');
+        $this->addSql('ALTER TABLE users DROP CONSTRAINT FK_1483A5E93C219753');
+        $this->addSql('DROP INDEX IDX_1483A5E93C219753');
+        $this->addSql('ALTER TABLE users DROP currentLocation_id');
     }
 }