Renamed a few things.
Beta