Function name and file name change to better reflect the driver