Improved driver handling of class names to use ucwords