fixing paths and nameings