I find it more readable with the Driver suffix but I guess it's just a matter of taste. I modified the PR :)