s/directory/dirname/ per another spec change