Changed names of collector drivers