Use the new synchronous shutdown nomenclature