diff --git a/src/Model/BoundaryCondition/BoundaryCondition.py b/src/Model/BoundaryCondition/BoundaryCondition.py
index 5a955b377b6ea9451281d867996f525d2bc98337..8bd4a2413e22271cf2a7f1a726e2cee51b8d19fb 100644
--- a/src/Model/BoundaryCondition/BoundaryCondition.py
+++ b/src/Model/BoundaryCondition/BoundaryCondition.py
@@ -200,6 +200,9 @@ class BoundaryCondition(SQLSubModel):
 
     @property
     def name(self):
+        if self._name == "":
+            return f"B{self.id + 1}"
+
         return self._name
 
     @name.setter
diff --git a/src/Model/LateralContribution/LateralContribution.py b/src/Model/LateralContribution/LateralContribution.py
index 2d956c023ff6f35cdc3e9a2d7c6ade73fdd4c3ec..eb1bc1034fbce6eb73dd4b1dff61b393ddb2c232 100644
--- a/src/Model/LateralContribution/LateralContribution.py
+++ b/src/Model/LateralContribution/LateralContribution.py
@@ -200,6 +200,9 @@ class LateralContribution(SQLSubModel):
 
     @property
     def name(self):
+        if self._name == "":
+            return f"L{self.id + 1}"
+
         return self._name
 
     @name.setter