Made Command names somewhat more consistent