Renaming root to root-expression and wildcard to wildcard-values