Changed names of the variables in the domain classes