Reworked the names of values in class Common