Reorg shortcuts to use labels