diff --git a/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudVorgangQueryMapper.java b/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudVorgangQueryMapper.java
index 954f949c83f0c008c0d4b4b7638731d1e7f36e88..0133a577c3451fbd6bfe6cb81a17fcaeacccd092 100644
--- a/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudVorgangQueryMapper.java
+++ b/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudVorgangQueryMapper.java
@@ -46,11 +46,11 @@ import de.ozgcloud.vorgang.vorgang.GrpcVorgangQueryExpression.Builder;
 @Mapper(collectionMappingStrategy = CollectionMappingStrategy.ADDER_PREFERRED, nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS, unmappedTargetPolicy = ReportingPolicy.WARN)
 public interface OzgCloudVorgangQueryMapper {
 
-	String FORM_ENGINE_NAME_PATH = "eingangs.header.formEngineName";
-	String STATUS_PATH = "status";
-	String ORGANISATIONS_EINHEIT_ID_PATH = "eingangs.zustaendigeStelle.organisationseinheitenId";
-	String AKTENZEICHEN_PATH = "aktenzeichen";
-	String FORM_ID_PATH = "eingangs.header.formId";
+	String FORM_ENGINE_NAME_PATH = "Vorgang.eingangs.header.formEngineName";
+	String FORM_ID_PATH = "Vorgang.eingangs.header.formId";
+	String STATUS_PATH = "Vorgang.status";
+	String ORGANISATIONS_EINHEIT_ID_PATH = "Vorgang.eingangs.zustaendigeStelle.organisationseinheitenId";
+	String AKTENZEICHEN_PATH = "Vorgang.aktenzeichen";
 
 	default GrpcQuery toGrpc(OzgCloudVorgangQuery ozgCloudVorgangQuery) {
 		return hasPropertyExpressions(ozgCloudVorgangQuery)