Renamed some stuff. Getting ready for ops.