Change command naming
Fix bug