Wrong modifier in introduce field fixed
Rename of super members
#SCL-6078 fixed
#SCL-6080 fixed
Some cleaning
Some refactoring