diff --git a/server/app/interfaces/registry.py b/server/app/interfaces/registry.py
index 8494b629..37ab9555 100644
--- a/server/app/interfaces/registry.py
+++ b/server/app/interfaces/registry.py
@@ -224,8 +224,8 @@ def get_all_submodel_descriptors_through_superpath(
         self, request: Request, url_args: Dict, response_t: Type[APIResponse], **_kwargs
     ) -> Response:
         aas_descriptor = self._get_aas_descriptor(url_args)
-        submodel_descriptors, cursor = self._get_slice(request, aas_descriptor.submodel_descriptors)
-        return response_t(list(submodel_descriptors), cursor=cursor)
+        submodel_descriptors, paging_metadata = self._get_slice(request, aas_descriptor.submodel_descriptors)
+        return response_t(list(submodel_descriptors), paging_metadata=paging_metadata)
 
     def get_submodel_descriptor_by_id_through_superpath(
         self, request: Request, url_args: Dict, response_t: Type[APIResponse], **_kwargs
diff --git a/server/app/interfaces/repository.py b/server/app/interfaces/repository.py
index 12d11209..0e75eedd 100644
--- a/server/app/interfaces/repository.py
+++ b/server/app/interfaces/repository.py
@@ -588,8 +588,8 @@ def get_aas_submodel_refs(
         aas = self._get_shell(url_args)
         submodel_refs: Iterator[model.ModelReference[model.Submodel]]
         sorted_submodel_refs = sorted(aas.submodel, key=lambda ref: ref.key[0].value)
-        submodel_refs, cursor = self._get_slice(request, sorted_submodel_refs)
-        return response_t(list(submodel_refs), cursor=cursor)
+        submodel_refs, paging_metadata = self._get_slice(request, sorted_submodel_refs)
+        return response_t(list(submodel_refs), paging_metadata=paging_metadata)
 
     def post_aas_submodel_refs(self, request: Request, url_args: Dict, response_t: Type[APIResponse],
                                map_adapter: MapAdapter, **_kwargs) -> Response:
@@ -947,8 +947,9 @@ def get_concept_description_all(
         self, request: Request, url_args: Dict, response_t: Type[APIResponse], **_kwargs
     ) -> Response:
         concept_descriptions: Iterator[model.ConceptDescription] = self._get_all_obj_of_type(model.ConceptDescription)
-        concept_descriptions, cursor = self._get_slice(request, concept_descriptions)
-        return response_t(list(concept_descriptions), cursor=cursor, stripped=is_stripped_request(request))
+        concept_descriptions, paging_metadata = self._get_slice(request, concept_descriptions)
+        return response_t(list(concept_descriptions), paging_metadata=paging_metadata,
+                          stripped=is_stripped_request(request))
 
     def post_concept_description(
         self, request: Request, url_args: Dict, response_t: Type[APIResponse], map_adapter: MapAdapter