Also use the group name as machine membership and other small cleanups