Changed some class names and made a few tweaks