diff --git a/pkg/apis/rook.io/v1alpha2/placement_test.go b/pkg/apis/rook.io/v1alpha2/placement_test.go
index 8126a2344..bc597f46f 100644
--- a/pkg/apis/rook.io/v1alpha2/placement_test.go
+++ b/pkg/apis/rook.io/v1alpha2/placement_test.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/ghodss/yaml"
 	"github.com/stretchr/testify/assert"
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 )
 
 func TestPlacement_spec(t *testing.T) {
@@ -76,7 +76,7 @@ tolerations:
 
 func TestPlacement_ApplyToPodSpec(t *testing.T) {
 	to := placementTestGetTolerations("foo", "bar")
-	na := placementTestGetNodeAffinity()
+	na := placementTestGenerateNodeAffinity()
 	expected := &v1.PodSpec{Affinity: &v1.Affinity{NodeAffinity: na}, Tolerations: to}
 
 	var p Placement
@@ -100,7 +100,7 @@ func TestPlacement_ApplyToPodSpec(t *testing.T) {
 	assert.Equal(t, expected, ps)
 
 	p = Placement{NodeAffinity: na}
-	nap := placementTestGetNodeAffinity()
+	nap := placementTestGenerateNodeAffinity()
 	nap.PreferredDuringSchedulingIgnoredDuringExecution[0].Weight = 5
 	ps = &v1.PodSpec{Affinity: &v1.Affinity{NodeAffinity: nap}, Tolerations: to}
 	p.ApplyToPodSpec(ps)
@@ -109,7 +109,7 @@ func TestPlacement_ApplyToPodSpec(t *testing.T) {
 
 func TestPlacement_Merge(t *testing.T) {
 	to := placementTestGetTolerations("foo", "bar")
-	na := placementTestGetNodeAffinity()
+	na := placementTestGenerateNodeAffinity()
 
 	var original, with, expected, merged Placement
 
@@ -145,7 +145,7 @@ func placementTestGetTolerations(key, value string) []v1.Toleration {
 	}
 }
 
-func placementTestGetNodeAffinity() *v1.NodeAffinity {
+func placementTestGenerateNodeAffinity() *v1.NodeAffinity {
 	return &v1.NodeAffinity{
 		RequiredDuringSchedulingIgnoredDuringExecution: &v1.NodeSelector{
 			NodeSelectorTerms: []v1.NodeSelectorTerm{
diff --git a/pkg/operator/ceph/agent/agent.go b/pkg/operator/ceph/agent/agent.go
index 7f7c9e149..2946c81bd 100644
--- a/pkg/operator/ceph/agent/agent.go
+++ b/pkg/operator/ceph/agent/agent.go
@@ -252,7 +252,7 @@ func (a *Agent) createAgentDaemonSet(namespace, agentImage, serviceAccount strin
 	// Add NodeAffinity if any
 	nodeAffinity := os.Getenv(agentDaemonsetNodeAffinityEnv)
 	if nodeAffinity != "" {
-		v1NodeAffinity, err := k8sutil.AddNodeAffinity(nodeAffinity)
+		v1NodeAffinity, err := k8sutil.GenerateNodeAffinity(nodeAffinity)
 		if err != nil {
 			logger.Errorf("failed to create NodeAffinity. %+v", err)
 		} else {
diff --git a/pkg/operator/discover/discover.go b/pkg/operator/discover/discover.go
index 1ac3278a1..67de99099 100644
--- a/pkg/operator/discover/discover.go
+++ b/pkg/operator/discover/discover.go
@@ -183,7 +183,7 @@ func (d *Discover) createDiscoverDaemonSet(namespace, discoverImage, securityAcc
 	// Add NodeAffinity if any
 	nodeAffinity := os.Getenv(discoverDaemonSetNodeAffinityEnv)
 	if nodeAffinity != "" {
-		v1NodeAffinity, err := k8sutil.AddNodeAffinity(nodeAffinity)
+		v1NodeAffinity, err := k8sutil.GenerateNodeAffinity(nodeAffinity)
 		if err != nil {
 			logger.Errorf("failed to create NodeAffinity. %+v", err)
 		} else {
diff --git a/pkg/operator/k8sutil/node.go b/pkg/operator/k8sutil/node.go
index 243b0099b..5d27bf20e 100644
--- a/pkg/operator/k8sutil/node.go
+++ b/pkg/operator/k8sutil/node.go
@@ -306,8 +306,8 @@ func NodeIsInRookNodeList(targetNodeName string, rookNodes []rookalpha.Node) boo
 	return false
 }
 
-// AddNodeAffinity will return v1.NodeAffinity or error
-func AddNodeAffinity(nodeAffinity string) (*v1.NodeAffinity, error) {
+// GenerateNodeAffinity will return v1.NodeAffinity or error
+func GenerateNodeAffinity(nodeAffinity string) (*v1.NodeAffinity, error) {
 	newNodeAffinity := &v1.NodeAffinity{
 		RequiredDuringSchedulingIgnoredDuringExecution: &v1.NodeSelector{
 			NodeSelectorTerms: []v1.NodeSelectorTerm{
diff --git a/pkg/operator/k8sutil/node_test.go b/pkg/operator/k8sutil/node_test.go
index 20e57d200..2d235147e 100644
--- a/pkg/operator/k8sutil/node_test.go
+++ b/pkg/operator/k8sutil/node_test.go
@@ -342,7 +342,7 @@ func TestNodeIsInRookList(t *testing.T) {
 	assert.True(t, NodeIsInRookNodeList("node0-hostname", rookNodes))
 }
 
-func TestAddNodeAffinity(t *testing.T) {
+func TestGenerateNodeAffinity(t *testing.T) {
 	type args struct {
 		nodeAffinity string
 	}
@@ -353,7 +353,7 @@ func TestAddNodeAffinity(t *testing.T) {
 		wantErr bool
 	}{
 		{
-			name: "AddNodeAffinity",
+			name: "GenerateNodeAffinity",
 			args: args{
 				nodeAffinity: "rook.io/ceph=true",
 			},
@@ -375,7 +375,7 @@ func TestAddNodeAffinity(t *testing.T) {
 			wantErr: false,
 		},
 		{
-			name: "FailAddNodeAffinity",
+			name: "FailGenerateNodeAffinity",
 			args: args{
 				nodeAffinity: "rook.io/ceph,minio=true",
 			},
@@ -383,7 +383,7 @@ func TestAddNodeAffinity(t *testing.T) {
 			wantErr: true,
 		},
 		{
-			name: "AddNodeAffinityWithKeyOnly",
+			name: "GenerateNodeAffinityWithKeyOnly",
 			args: args{
 				nodeAffinity: "rook.io/ceph",
 			},
@@ -406,13 +406,13 @@ func TestAddNodeAffinity(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got, err := AddNodeAffinity(tt.args.nodeAffinity)
+			got, err := GenerateNodeAffinity(tt.args.nodeAffinity)
 			if (err != nil) != tt.wantErr {
-				t.Errorf("AddNodeAffinity() error = %v, wantErr %v", err, tt.wantErr)
+				t.Errorf("GenerateNodeAffinity() error = %v, wantErr %v", err, tt.wantErr)
 				return
 			}
 			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("AddNodeAffinity() = %v, want %v", got, tt.want)
+				t.Errorf("GenerateNodeAffinity() = %v, want %v", got, tt.want)
 			}
 		})
 	}