FIX: still more old names to be updated