CalendarCommand renamed to ClientCommand.