Remove groupId Suffix; it is now in groupId Prop.