diff --git a/include/caosdb/entity.h b/include/caosdb/entity.h
index 08a7be6b0f6f2b42752ff78f2a004e7196e9e757..e6fd5d9c5551893b6d2863db46e56bdfbe97fa1b 100644
--- a/include/caosdb/entity.h
+++ b/include/caosdb/entity.h
@@ -703,7 +703,7 @@ public:
    */
   auto CopyTo(ProtoEntity *target) -> void;
 
-  auto SetFilePath(const std::string &path) -> void;
+  auto SetRemotePath(const std::string &path) -> void;
   inline auto HasFile() const -> bool { return !this->file_descriptor.local_path.empty(); }
   auto SetFileTransmissionRegistrationId(const std::string &registration_id) -> void;
   inline auto SetFileTransmissionId(FileTransmissionId *file_transmission_id) -> void {
diff --git a/include/ccaosdb.h b/include/ccaosdb.h
index e643e0d4fa048495036341ae18556ce8ebf557b7..8ac122f3e4d9f4d74bf946f261b40dde97d639ab 100644
--- a/include/ccaosdb.h
+++ b/include/ccaosdb.h
@@ -418,7 +418,7 @@ int caosdb_entity_entity_set_role(caosdb_entity_entity *entity, const char *role
 int caosdb_entity_entity_set_name(caosdb_entity_entity *entity, const char *name);
 int caosdb_entity_entity_set_description(caosdb_entity_entity *entity, const char *description);
 int caosdb_entity_entity_set_local_path(caosdb_entity_entity *entity, const char *name);
-int caosdb_entity_entity_set_file_path(caosdb_entity_entity *entity, const char *name);
+int caosdb_entity_entity_set_remote_path(caosdb_entity_entity *entity, const char *name);
 /**
  * Set the entity's datatype by name, and whether it is a reference or a list.
  */
diff --git a/src/caosdb/entity.cpp b/src/caosdb/entity.cpp
index 3e14a90f9e1ef3f3d53e5bf7141b2063a70c398e..4ebfef6b17b3de3077307098c29d2f32e1081285 100644
--- a/src/caosdb/entity.cpp
+++ b/src/caosdb/entity.cpp
@@ -264,7 +264,7 @@ auto Entity::SetDataType(const std::string &new_data_type, bool list_type) -> St
   return SetDataType(DataType(new_data_type, list_type));
 }
 
-auto Entity::SetFilePath(const std::string &path) -> void {
+auto Entity::SetRemotePath(const std::string &path) -> void {
   this->wrapped->mutable_file_descriptor()->set_path(path);
 }
 
diff --git a/src/ccaosdb.cpp b/src/ccaosdb.cpp
index bd2cbf662ee2fd88369f5d52ae08160ff9f175af..a4d9e359fbcb9d3ea2cbcf951d8258480a418a6a 100644
--- a/src/ccaosdb.cpp
+++ b/src/ccaosdb.cpp
@@ -606,7 +606,7 @@ ERROR_RETURN_CODE(GENERIC_ERROR,
                     *out = tmp;
                     return 0;
                   })
-// CAOSDB_ENTITY_GET(file_path, GetFilePath()) TODO(henrik)
+// CAOSDB_ENTITY_GET(remote_path, GetRemotePath()) TODO(henrik)
 CAOSDB_ENTITY_GET(description, GetDescription())
 ERROR_RETURN_CODE(GENERIC_ERROR,
                   int caosdb_entity_entity_get_datatype(caosdb_entity_entity *entity, char **name,
@@ -1007,7 +1007,7 @@ ERROR_RETURN_CODE(GENERIC_ERROR,
 CAOSDB_ENTITY_SET(name, name, wrapped_entity->SetName(std::string(name));)
 CAOSDB_ENTITY_SET(local_path, local_path,
                   return wrapped_entity->SetLocalPath(boost::filesystem::path(local_path));)
-CAOSDB_ENTITY_SET(file_path, file_path, wrapped_entity->SetFilePath(std::string(file_path));)
+CAOSDB_ENTITY_SET(remote_path, remote_path, wrapped_entity->SetRemotePath(std::string(remote_path));)
 CAOSDB_ENTITY_SET(description, description,
                   wrapped_entity->SetDescription(std::string(description));)
 ERROR_RETURN_CODE(GENERIC_ERROR,