Update expressions and pom name