Naming of AffinityGroup to Affinity_Group