diff --git a/loanpy/src/loan/conf.py b/loanpy/src/loan/conf.py
index fcfb1654f3df9bcfa8270ea3cc6d910860e5e383..a2eeb2ec78ed6ea64ede3a9a7d5d27dd466e1288 100644
--- a/loanpy/src/loan/conf.py
+++ b/loanpy/src/loan/conf.py
@@ -24,5 +24,6 @@ RETURNED = db.Property(name="returned", datatype=db.DATETIME)
 BOX_NUMBER = db.Property(name="Number", datatype=db.TEXT)
 
 # Other Strings
+# TODO: Adapt datamodel and remove name override
 BOX_RETURNED = "Box (returned)"
 BOX_BORROWED = "Box (borrowed)"
diff --git a/loanpy/src/loan/confirm_loan.py b/loanpy/src/loan/confirm_loan.py
index cf4fab52dba066cd0856fb225736f02e517d0043..f503f8ee56fcd7b41c26bcbc14d6d4e206497fea 100755
--- a/loanpy/src/loan/confirm_loan.py
+++ b/loanpy/src/loan/confirm_loan.py
@@ -26,8 +26,8 @@ import caosdb as db
 from caosadvancedtools.serverside.helper import get_timestamp, print_success
 
 from .box_loan import (BOX, BOX_BORROWED, DESTINATION, F_LOAN, LENT, S_LENT,
-                      S_LOAN_ACCEPTED, assert_loan_state, get_borrower_names,
-                      get_loan, main, set_location, set_property)
+                       S_LOAN_ACCEPTED, assert_loan_state, get_borrower_names,
+                       get_loan, main, set_location, set_property)
 
 
 def _set_lent_box(loan):
@@ -35,6 +35,7 @@ def _set_lent_box(loan):
 
     This stores the version of the box when it was delivered to the borrower.
     """
+    # TODO: Adapt datamodel and remove name override
     box_prop = loan.get_property(BOX)
     box_prop.name = BOX_BORROWED
     box_prop.value = str(box_prop.value) + "@HEAD"
diff --git a/loanpy/src/loan/manual_return.py b/loanpy/src/loan/manual_return.py
index 0505088f44f5a33a6b8c6c81d3baf14629da4729..06fec359759e810c8e705ce7ab5fdb4130295238 100755
--- a/loanpy/src/loan/manual_return.py
+++ b/loanpy/src/loan/manual_return.py
@@ -26,9 +26,9 @@ import caosdb as db
 from caosadvancedtools.serverside.helper import get_timestamp, print_success
 
 from .box_loan import (BOX, BOX_BORROWED, BOX_RETURNED, CONTENT, F_LOAN,
-                      RETURNED, RETURNLOCATION, S_RETURN_ACCEPTED, S_RETURNED,
-                      assert_loan_state, get_borrower_names, get_loan, main,
-                      set_location, set_property)
+                       RETURNED, RETURNLOCATION, S_RETURN_ACCEPTED, S_RETURNED,
+                       assert_loan_state, get_borrower_names, get_loan, main,
+                       set_location, set_property)
 
 
 def _set_returned_box(loan):
@@ -37,6 +37,7 @@ def _set_returned_box(loan):
     This stores the version of the box that was returned by a borrower.
     """
     box_id = loan.get_property(BOX_BORROWED).value.split("@")[0]
+    # TODO: Adapt datamodel and remove name override
     loan.add_property(property=BOX,
                       name=BOX_RETURNED,
                       value=box_id + "@HEAD")