directory names are now consistent