Changed some names, solved some more

Meh