#24 - Change command name