Fix to make directory names more consistent.