Fix obvious name-change bugs

whoops, broke stuff.