Fixed compile errors

Renamed a couple things.