CHG: new directory names