Renamed a few things. Removed some cruft.