Small updates. Renamed a couple things