Rename directories to have a simpler meaning.