renaming group for base model
Blargh... yeah, renamed all these object. Probably shouldn't go with generic names as not to clash.