Merge "Ensure directory names are aligned correctly..." into nyc-dev