Renamed Commands enumeration to Command to match naming conventions