Renamed stuff (with wbyoung). Austin, you just have to deal with the new names.