Repaired naming of drivers