fix a bunch of mis-named things