Updated directory names to properly pull from the name property.