diff --git a/components.py b/components.py
index a833ee6a..9ef93632 100644
--- a/components.py
+++ b/components.py
@@ -293,9 +293,9 @@ def on_get(self, req: falcon.asgi.Request, resp: falcon.asgi.Response):
 
             component_dependency['comp_ref'] = [
                 {
-                    'name': ref.name,
-                    'version': ref.version,
-                    'repositoryContexts': ref.repositoryContexts,
+                    'name': ref.component.name,
+                    'version': ref.component.version,
+                    'repositoryContexts': ref.component.repositoryContexts,
                 }
                 for ref in component.path
             ]
@@ -678,7 +678,7 @@ def resolve_component_dependencies(
     component_version: str,
     component_descriptor_lookup: cnudie.retrieve.ComponentDescriptorLookupById,
     ctx_repo: cm.OcmRepository=None,
-) -> list[cm.Component]:
+) -> list[cnudie.iter.ComponentNode]:
     descriptor = util.retrieve_component_descriptor(
         cm.ComponentIdentity(
             name=component_name,
diff --git a/issue_replicator/__main__.py b/issue_replicator/__main__.py
index 3a938576..dc0e6113 100644
--- a/issue_replicator/__main__.py
+++ b/issue_replicator/__main__.py
@@ -155,12 +155,12 @@ def _artefacts_for_backlog_item_and_components(
             # found artefact of backlog item in component's artefact
             if artefact_kind == 'resource':
                 artefact_node = cnudie.iter.ResourceNode(
-                    path=(component,),
+                    path=(cnudie.iter.NodePathEntry(component),),
                     resource=artefact,
                 )
             elif artefact_kind == 'source':
                 artefact_node = cnudie.iter.SourceNode(
-                    path=(component,),
+                    path=(cnudie.iter.NodePathEntry(component),),
                     source=artefact,
                 )
 
diff --git a/k8s/backlog.py b/k8s/backlog.py
index 1c96b2b8..fe15bf55 100644
--- a/k8s/backlog.py
+++ b/k8s/backlog.py
@@ -438,6 +438,6 @@ def get_resource_node(
         raise ValueError(resource)
 
     return cnudie.iter.ResourceNode(
-        path=(component,),
+        path=(cnudie.iter.NodePathEntry(component),),
         resource=resource,
     )