diff --git a/include/caosdb/entity.h b/include/caosdb/entity.h
index 5e1b87fa1721abd0a9fe4ec40cf51797c99bf735..2f662e06a83e0877746ffdf85587edc6be03236d 100644
--- a/include/caosdb/entity.h
+++ b/include/caosdb/entity.h
@@ -178,7 +178,7 @@ protected:
   /**
    * Remove the element at the given index.
    */
-  inline auto remove(int index) -> void {
+  inline auto Remove(int index) -> void {
     this->wrapped->DeleteSubrange(index, 1);
     if (cache.count(index) > 0) {
       cache.erase(index);
@@ -643,6 +643,8 @@ public:
   };
 
   [[nodiscard]] auto GetParents() const -> const Parents &;
+  // TODO(henrik) const prevents properties from being changed
+  // what about an interface that operates on the list directly?
   [[nodiscard]] auto GetProperties() const -> const Properties &;
   [[nodiscard]] inline auto GetErrors() const -> const Messages & {
     return errors;
diff --git a/src/caosdb/entity.cpp b/src/caosdb/entity.cpp
index b000e75887269453c74360308b618a97cafc436e..e1fcc5f3c148414ca57718ecbd7201ee0b2323a4 100644
--- a/src/caosdb/entity.cpp
+++ b/src/caosdb/entity.cpp
@@ -158,7 +158,7 @@ auto Entity::AppendParent(const Parent &parent) -> void {
   this->parents.Append(parent);
 }
 
-auto Entity::RemoveParent(int index) -> void { this->parents.remove(index); }
+auto Entity::RemoveParent(int index) -> void { this->parents.Remove(index); }
 
 [[nodiscard]] auto Entity::GetProperties() const -> const Properties & {
   return properties;
@@ -169,7 +169,7 @@ auto Entity::AppendProperty(const Property &property) -> void {
 }
 
 auto Entity::RemoveProperty(int index) -> void {
-  this->properties.remove(index);
+  this->properties.Remove(index);
 }
 
 auto Entity::CreateProtoEntity() -> ProtoEntity * {