fixup more renamed things