Updated directory names