FIX: More bugs from the renaming.