Changing command names
Small refactor