Small changes according to the class reference

It looks like this values are supposed to be in different order due to the class reference and practice.