More classname tweaks

Thanks @pmario