Support new build stream sub-directory naming
3 files changed