some cleaning
Some refactoring
NPE fixed
Rename of overriden type aliases fixed
#SCL-6574 fixed