Merge "Respond to API feedback for directory names."