diff --git a/sample-management-custom/caosdb-server/scripting/bin/update_containers.py b/sample-management-custom/caosdb-server/scripting/bin/update_containers.py
index 12ef9b6a907f5fb587e5e768ea10e4a6c6d347cb..985a5d130ab3bce50e10c0d9820c610372d2b2b3 100755
--- a/sample-management-custom/caosdb-server/scripting/bin/update_containers.py
+++ b/sample-management-custom/caosdb-server/scripting/bin/update_containers.py
@@ -194,13 +194,13 @@ def main():
                 child.get_property(custom_label_prop.id).value = row[get_column_header_name("custom_label_prop")]
 
         # Treat PI
-        if _value_in_row("PI", row):
-            pi = row["PI"]
-            pi_prop = cached_get_entity_by(query="FIND PROPERTY Pi")
+        if _value_in_row(get_column_header_name("PI"), row):
+            pi = row[get_column_header_name("PI")]
+            pi_prop = cached_get_entity_by(query=f"FIND PROPERTY {get_entity_name{'PI'}")
             try:
                 query = f"FIND RECORD Person WITH ID={int(pi)}"
             except ValueError:
-                query = f"FIND RECORD Person WITH AN Abbreviation='{pi}'"
+                query = f"FIND RECORD Person WITH AN '{get_entity_name('abbreviation_prop')}'='{pi}'"
             try:
                 pi_rec = cached_get_entity_by(query=query)
                 if child.get_property(pi_prop.name) is not None:
@@ -208,7 +208,7 @@ def main():
                 else:
                     child.add_property(id=pi_prop.id, name=pi_prop.name, value=pi_rec.id)
             except db.EmptyUniqueQueryError:
-                logger.warning(f"There is no PI with BIS ID or abbreviation {pi}. Skipping.")
+                logger.warning(f"There is no PI with ID or {get_entity_name('abbreviation_prop')} {pi}. Skipping.")
 
         # Collection(s)
         if _value_in_row("Collection", row):