Rename $cmd_name to $command_name for consistency
Be more elegant with attribute declarations