Renamed commands to command and command to directive