Small refactoring of names
Fixing bug when ctor has closure and calls super.xx