More fixes to changed paths and names.