fixup couple of naming issues