Merge "[A1P] Correct the ConfigMap Naming"