Transformator/ClassConstant

Resolve #588
Fix #583
Please see #592

@cordoval if you found some other names worth changing please propose it (maybe by PR;P)