Renaming and fixing logic in user-group-model