Fix name and permissions syncing, again