Improved command naming