More changes

Renamed some stuff, and removed a couple dummies.