Rework directory destination names