diff --git a/packages/cli/src/LoadNodesAndCredentials.ts b/packages/cli/src/LoadNodesAndCredentials.ts
index 4a1c0eff29..af6b6a1460 100644
--- a/packages/cli/src/LoadNodesAndCredentials.ts
+++ b/packages/cli/src/LoadNodesAndCredentials.ts
@@ -354,12 +354,12 @@ export class LoadNodesAndCredentialsClass implements INodesAndCredentials {
 		}
 
 		// Nodes and credentials that will be lazy loaded
-		if (loader instanceof LazyPackageDirectoryLoader) {
+		if (loader instanceof PackageDirectoryLoader) {
 			const { packageName, known } = loader;
 
 			for (const type in known.nodes) {
 				const { className, sourcePath } = known.nodes[type];
-				this.known.nodes[`${packageName}.${type}`] = {
+				this.known.nodes[type] = {
 					className,
 					sourcePath: path.join(dir, sourcePath),
 				};
diff --git a/packages/core/src/DirectoryLoader.ts b/packages/core/src/DirectoryLoader.ts
index 854e6742a6..57bd66619e 100644
--- a/packages/core/src/DirectoryLoader.ts
+++ b/packages/core/src/DirectoryLoader.ts
@@ -104,6 +104,11 @@ export abstract class DirectoryLoader {
 				: tmpNode.description.version;
 		}
 
+		this.known.nodes[fullNodeName] = {
+			className: nodeName,
+			sourcePath: filePath,
+		};
+
 		this.nodeTypes[fullNodeName] = {
 			type: tempNode,
 			sourcePath: filePath,
@@ -139,6 +144,11 @@ export abstract class DirectoryLoader {
 			}
 		}
 
+		this.known.credentials[tempCredential.name] = {
+			className: credentialName,
+			sourcePath: filePath,
+		};
+
 		this.credentialTypes[tempCredential.name] = {
 			type: tempCredential,
 			sourcePath: filePath,
@@ -319,7 +329,10 @@ export class LazyPackageDirectoryLoader extends PackageDirectoryLoader {
 		await this.readPackageJson();
 
 		try {
-			this.known.nodes = await this.readJSON('dist/known/nodes.json');
+			const knownNodes: typeof this.known.nodes = await this.readJSON('dist/known/nodes.json');
+			for (const nodeName in knownNodes) {
+				this.known.nodes[`${this.packageName}.${nodeName}`] = knownNodes[nodeName];
+			}
 			this.known.credentials = await this.readJSON('dist/known/credentials.json');
 
 			this.types.nodes = await this.readJSON('dist/types/nodes.json');