Unify constructor/destructor names in the code
Merge branch 'ctor-dtor-unify'