Rename command name and fix related tests