Fixing things up.

Changing names and bein cool.