* cleanup changeset and group fixes * chore: merge more fixes * chore: merge more changesets * chore: fix issue with naming