diff --git a/internal/controller/nnf_clientmount_controller_test.go b/internal/controller/nnf_clientmount_controller_test.go
index 19a6cf95..1373361e 100644
--- a/internal/controller/nnf_clientmount_controller_test.go
+++ b/internal/controller/nnf_clientmount_controller_test.go
@@ -71,7 +71,7 @@ var _ = Describe("Clientmount Controller Test", func() {
 		Expect(m["mgtmdt"]).To(HaveLen(1))
 		Expect(m["mgtmdt"]).Should(ContainElements("rabbit-node-4"))
 
-		Expect(m["nnfNodes"]).To(HaveLen(5))
-		Expect(m["nnfNodes"]).Should(ContainElements("rabbit-node-1", "rabbit-node-2", "rabbit-node-3", "rabbit-node-4", "rabbit-node-8"))
+		Expect(m["nnfNode"]).To(HaveLen(5))
+		Expect(m["nnfNode"]).Should(ContainElements("rabbit-node-1", "rabbit-node-2", "rabbit-node-3", "rabbit-node-4", "rabbit-node-8"))
 	})
 })
diff --git a/internal/controller/nnf_storage_controller.go b/internal/controller/nnf_storage_controller.go
index 90acc35a..cf86b487 100644
--- a/internal/controller/nnf_storage_controller.go
+++ b/internal/controller/nnf_storage_controller.go
@@ -199,8 +199,8 @@ func (r *NnfStorageReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 			MDTs:     components["mdt"],
 			MGTs:     components["mgt"],
 			MGTMDTs:  components["mgtmdt"],
-			OSTs:     components["osts"],
-			NNFNodes: components["nnfNodes"],
+			OSTs:     components["ost"],
+			NNFNodes: components["nnfNode"],
 		}
 	}
 
@@ -1287,11 +1287,11 @@ func (r *NnfStorageReconciler) getLustreOST0(ctx context.Context, storage *nnfv1
 
 func getLustreMappingFromStorage(storage *nnfv1alpha4.NnfStorage) map[string][]string {
 	componentMap := map[string][]string{
-		"mdt":      {},
-		"mgt":      {},
-		"mgtmdt":   {},
-		"ost":      {},
-		"nnfNodes": {},
+		"mdt":     {},
+		"mgt":     {},
+		"mgtmdt":  {},
+		"ost":     {},
+		"nnfNode": {},
 	}
 	rabbitMap := make(map[string]bool) // use a map to keep the list unique
 
diff --git a/internal/controller/nnf_storage_controller_test.go b/internal/controller/nnf_storage_controller_test.go
index 0b6e1ef4..aece6415 100644
--- a/internal/controller/nnf_storage_controller_test.go
+++ b/internal/controller/nnf_storage_controller_test.go
@@ -71,7 +71,7 @@ var _ = Describe("NNFStorage Controller Test", func() {
 		Expect(m["mgtmdt"]).To(HaveLen(1))
 		Expect(m["mgtmdt"]).Should(ContainElements("rabbit-node-4"))
 
-		Expect(m["nnfNodes"]).To(HaveLen(5))
-		Expect(m["nnfNodes"]).Should(ContainElements("rabbit-node-1", "rabbit-node-2", "rabbit-node-3", "rabbit-node-4", "rabbit-node-8"))
+		Expect(m["nnfNode"]).To(HaveLen(5))
+		Expect(m["nnfNode"]).Should(ContainElements("rabbit-node-1", "rabbit-node-2", "rabbit-node-3", "rabbit-node-4", "rabbit-node-8"))
 	})
 })