Changed Names of Class and Driver
Not sure whats going on here. Gonna commit anyhow.