Refactored Command names