diff --git a/rentals/models.py b/rentals/models.py
index 8fc8d8b..42668bb 100644
--- a/rentals/models.py
+++ b/rentals/models.py
@@ -38,13 +38,13 @@ class LockerUnit(models.Model):
     def __str__(self):
         last_letter = chr(ord(self.first_letter) + self.columns - 1)
         last_number = self.first_number + self.columns * self.rows
-        return f"{self.bank.name} (Unit {self.first_letter}{self.first_number}-{last_letter}{last_number})"
+        return f"{self.bank.name} (Unit {last_letter}{self.first_number}-{self.first_letter}{last_number})"
 
     def letter_for_column(self, column: int) -> str:
         return chr(column + ord(self.first_letter))
 
     def number_for_locker(self, column: int, row: int) -> int:
-        return row + self.first_number + column * self.rows
+        return row + self.first_number + (self.columns - column - 1) * self.rows
 
     @property
     def iter_doors(self):