Rename internals, remove `__super__`