Rename flags to keep mesos nomenclature