Updated directory naming convention