Renamed _extended buttons remove '_extended'