refactor: use key_name, delete groupname property