simplified and renamed variables in master-pom