diff --git a/pkg/scheduler/algorithm/predicates/metadata.go b/pkg/scheduler/algorithm/predicates/metadata.go
index 453bfb550a..9417e645c6 100644
--- a/pkg/scheduler/algorithm/predicates/metadata.go
+++ b/pkg/scheduler/algorithm/predicates/metadata.go
@@ -56,10 +56,10 @@ type predicateMetadata struct {
 	matchingAntiAffinityTerms map[string][]matchingPodAntiAffinityTerm
 	// A map of node name to a list of Pods on the node that can potentially match
 	// the affinity rules of the "pod".
-	matchingAffinityPods map[string][]*v1.Pod
+	nodeNameToMatchingAffinityPods map[string][]*v1.Pod
 	// A map of node name to a list of Pods on the node that can potentially match
 	// the anti-affinity rules of the "pod".
-	matchingAntiAffinityPods           map[string][]*v1.Pod
+	nodeNameToMatchingAntiAffinityPods map[string][]*v1.Pod
 	serviceAffinityInUse               bool
 	serviceAffinityMatchingPodList     []*v1.Pod
 	serviceAffinityMatchingPodServices []*v1.Service
@@ -123,13 +123,13 @@ func (pfactory *PredicateMetadataFactory) GetMetadata(pod *v1.Pod, nodeNameToInf
 		return nil
 	}
 	predicateMetadata := &predicateMetadata{
-		pod:                       pod,
-		podBestEffort:             isPodBestEffort(pod),
-		podRequest:                GetResourceRequest(pod),
-		podPorts:                  schedutil.GetContainerPorts(pod),
-		matchingAntiAffinityTerms: matchingTerms,
-		matchingAffinityPods:      affinityPods,
-		matchingAntiAffinityPods:  antiAffinityPods,
+		pod:                                pod,
+		podBestEffort:                      isPodBestEffort(pod),
+		podRequest:                         GetResourceRequest(pod),
+		podPorts:                           schedutil.GetContainerPorts(pod),
+		matchingAntiAffinityTerms:          matchingTerms,
+		nodeNameToMatchingAffinityPods:     affinityPods,
+		nodeNameToMatchingAntiAffinityPods: antiAffinityPods,
 	}
 	for predicateName, precomputeFunc := range predicateMetadataProducers {
 		glog.V(10).Infof("Precompute: %v", predicateName)
@@ -152,17 +152,23 @@ func (meta *predicateMetadata) RemovePod(deletedPod *v1.Pod) error {
 	podNodeName := deletedPod.Spec.NodeName
 	if affinity != nil && len(podNodeName) > 0 {
 		if affinity.PodAffinity != nil {
-			for i, p := range meta.matchingAffinityPods[podNodeName] {
+			for i, p := range meta.nodeNameToMatchingAffinityPods[podNodeName] {
 				if p == deletedPod {
-					meta.matchingAffinityPods[podNodeName] = append(meta.matchingAffinityPods[podNodeName][:i], meta.matchingAffinityPods[podNodeName][i+1:]...)
+					s := meta.nodeNameToMatchingAffinityPods[podNodeName]
+					s[i] = s[len(s)-1]
+					s = s[:len(s)-1]
+					meta.nodeNameToMatchingAffinityPods[podNodeName] = s
 					break
 				}
 			}
 		}
 		if affinity.PodAntiAffinity != nil {
-			for i, p := range meta.matchingAntiAffinityPods[podNodeName] {
+			for i, p := range meta.nodeNameToMatchingAntiAffinityPods[podNodeName] {
 				if p == deletedPod {
-					meta.matchingAntiAffinityPods[podNodeName] = append(meta.matchingAntiAffinityPods[podNodeName][:i], meta.matchingAntiAffinityPods[podNodeName][i+1:]...)
+					s := meta.nodeNameToMatchingAntiAffinityPods[podNodeName]
+					s[i] = s[len(s)-1]
+					s = s[:len(s)-1]
+					meta.nodeNameToMatchingAntiAffinityPods[podNodeName] = s
 					break
 				}
 			}
@@ -210,32 +216,32 @@ func (meta *predicateMetadata) AddPod(addedPod *v1.Pod, nodeInfo *schedulercache
 			meta.matchingAntiAffinityTerms[addedPodFullName] = podMatchingTerms
 		}
 	}
-	// Add the pod to matchingAffinityPods and matchingAntiAffinityPods if needed.
+	// Add the pod to nodeNameToMatchingAffinityPods and nodeNameToMatchingAntiAffinityPods if needed.
 	affinity := meta.pod.Spec.Affinity
 	podNodeName := addedPod.Spec.NodeName
 	if affinity != nil && len(podNodeName) > 0 {
 		if targetPodMatchesAffinityOfPod(meta.pod, addedPod) {
 			found := false
-			for _, p := range meta.matchingAffinityPods[podNodeName] {
+			for _, p := range meta.nodeNameToMatchingAffinityPods[podNodeName] {
 				if p == addedPod {
 					found = true
 					break
 				}
 			}
 			if !found {
-				meta.matchingAffinityPods[podNodeName] = append(meta.matchingAffinityPods[podNodeName], addedPod)
+				meta.nodeNameToMatchingAffinityPods[podNodeName] = append(meta.nodeNameToMatchingAffinityPods[podNodeName], addedPod)
 			}
 		}
 		if targetPodMatchesAntiAffinityOfPod(meta.pod, addedPod) {
 			found := false
-			for _, p := range meta.matchingAntiAffinityPods[podNodeName] {
+			for _, p := range meta.nodeNameToMatchingAntiAffinityPods[podNodeName] {
 				if p == addedPod {
 					found = true
 					break
 				}
 			}
 			if !found {
-				meta.matchingAntiAffinityPods[podNodeName] = append(meta.matchingAntiAffinityPods[podNodeName], addedPod)
+				meta.nodeNameToMatchingAntiAffinityPods[podNodeName] = append(meta.nodeNameToMatchingAntiAffinityPods[podNodeName], addedPod)
 			}
 		}
 	}
@@ -266,13 +272,13 @@ func (meta *predicateMetadata) ShallowCopy() algorithm.PredicateMetadata {
 	for k, v := range meta.matchingAntiAffinityTerms {
 		newPredMeta.matchingAntiAffinityTerms[k] = append([]matchingPodAntiAffinityTerm(nil), v...)
 	}
-	newPredMeta.matchingAffinityPods = make(map[string][]*v1.Pod)
-	for k, v := range meta.matchingAffinityPods {
-		newPredMeta.matchingAffinityPods[k] = append([]*v1.Pod(nil), v...)
+	newPredMeta.nodeNameToMatchingAffinityPods = make(map[string][]*v1.Pod)
+	for k, v := range meta.nodeNameToMatchingAffinityPods {
+		newPredMeta.nodeNameToMatchingAffinityPods[k] = append([]*v1.Pod(nil), v...)
 	}
-	newPredMeta.matchingAntiAffinityPods = make(map[string][]*v1.Pod)
-	for k, v := range meta.matchingAntiAffinityPods {
-		newPredMeta.matchingAntiAffinityPods[k] = append([]*v1.Pod(nil), v...)
+	newPredMeta.nodeNameToMatchingAntiAffinityPods = make(map[string][]*v1.Pod)
+	for k, v := range meta.nodeNameToMatchingAntiAffinityPods {
+		newPredMeta.nodeNameToMatchingAntiAffinityPods[k] = append([]*v1.Pod(nil), v...)
 	}
 	newPredMeta.serviceAffinityMatchingPodServices = append([]*v1.Service(nil),
 		meta.serviceAffinityMatchingPodServices...)
diff --git a/pkg/scheduler/algorithm/predicates/metadata_test.go b/pkg/scheduler/algorithm/predicates/metadata_test.go
index 18229f9ea8..b5b450f5d1 100644
--- a/pkg/scheduler/algorithm/predicates/metadata_test.go
+++ b/pkg/scheduler/algorithm/predicates/metadata_test.go
@@ -118,15 +118,15 @@ func predicateMetadataEquivalent(meta1, meta2 *predicateMetadata) error {
 	if !reflect.DeepEqual(meta1.matchingAntiAffinityTerms, meta2.matchingAntiAffinityTerms) {
 		return fmt.Errorf("matchingAntiAffinityTerms are not euqal")
 	}
-	sortNodePodMap(meta1.matchingAffinityPods)
-	sortNodePodMap(meta2.matchingAffinityPods)
-	if !reflect.DeepEqual(meta1.matchingAffinityPods, meta2.matchingAffinityPods) {
-		return fmt.Errorf("matchingAffinityPods are not euqal")
+	sortNodePodMap(meta1.nodeNameToMatchingAffinityPods)
+	sortNodePodMap(meta2.nodeNameToMatchingAffinityPods)
+	if !reflect.DeepEqual(meta1.nodeNameToMatchingAffinityPods, meta2.nodeNameToMatchingAffinityPods) {
+		return fmt.Errorf("nodeNameToMatchingAffinityPods are not euqal")
 	}
-	sortNodePodMap(meta1.matchingAntiAffinityPods)
-	sortNodePodMap(meta2.matchingAntiAffinityPods)
-	if !reflect.DeepEqual(meta1.matchingAntiAffinityPods, meta2.matchingAntiAffinityPods) {
-		return fmt.Errorf("matchingAntiAffinityPods are not euqal")
+	sortNodePodMap(meta1.nodeNameToMatchingAntiAffinityPods)
+	sortNodePodMap(meta2.nodeNameToMatchingAntiAffinityPods)
+	if !reflect.DeepEqual(meta1.nodeNameToMatchingAntiAffinityPods, meta2.nodeNameToMatchingAntiAffinityPods) {
+		return fmt.Errorf("nodeNameToMatchingAntiAffinityPods are not euqal")
 	}
 	if meta1.serviceAffinityInUse {
 		sortablePods1 := sortablePods(meta1.serviceAffinityMatchingPodList)
@@ -473,7 +473,7 @@ func TestPredicateMetadata_ShallowCopy(t *testing.T) {
 				},
 			},
 		},
-		matchingAffinityPods: map[string][]*v1.Pod{
+		nodeNameToMatchingAffinityPods: map[string][]*v1.Pod{
 			"nodeA": {
 				&v1.Pod{ObjectMeta: metav1.ObjectMeta{Name: "p1", Labels: selector1},
 					Spec: v1.PodSpec{NodeName: "nodeA"},
@@ -490,7 +490,7 @@ func TestPredicateMetadata_ShallowCopy(t *testing.T) {
 				},
 			},
 		},
-		matchingAntiAffinityPods: map[string][]*v1.Pod{
+		nodeNameToMatchingAntiAffinityPods: map[string][]*v1.Pod{
 			"nodeN": {
 				&v1.Pod{ObjectMeta: metav1.ObjectMeta{Name: "p1", Labels: selector1},
 					Spec: v1.PodSpec{NodeName: "nodeN"},
diff --git a/pkg/scheduler/algorithm/predicates/predicates.go b/pkg/scheduler/algorithm/predicates/predicates.go
index e0b22866e3..e01bdd4c70 100644
--- a/pkg/scheduler/algorithm/predicates/predicates.go
+++ b/pkg/scheduler/algorithm/predicates/predicates.go
@@ -1423,7 +1423,7 @@ func (c *PodAffinityChecker) satisfiesPodsAffinityAntiAffinity(pod *v1.Pod,
 	}
 	if predicateMeta, ok := meta.(*predicateMetadata); ok {
 		// Check all affinity terms.
-		matchingPods := predicateMeta.matchingAffinityPods
+		matchingPods := predicateMeta.nodeNameToMatchingAffinityPods
 		for _, term := range GetPodAffinityTerms(affinity.PodAffinity) {
 			termMatches, err := c.anyMatchingPodInTopology(pod, matchingPods, nodeInfo, &term)
 			if err != nil {
@@ -1445,7 +1445,7 @@ func (c *PodAffinityChecker) satisfiesPodsAffinityAntiAffinity(pod *v1.Pod,
 		}
 
 		// Check all anti-affinity terms.
-		matchingPods = predicateMeta.matchingAntiAffinityPods
+		matchingPods = predicateMeta.nodeNameToMatchingAntiAffinityPods
 		for _, term := range GetPodAntiAffinityTerms(affinity.PodAntiAffinity) {
 			termMatches, err := c.anyMatchingPodInTopology(pod, matchingPods, nodeInfo, &term)
 			if err != nil || termMatches {