Renamed stuff

Renamed stuff to work right