Fixes for updated class names. Thanks @Mottie.