Renamed a couple more things