Fix names of conditional fields (they are defined more than in 1 place).
Function's mutator is no longer called at the moment of creation.