Refactor | Beverly | rename move and extract CommandMapper