Make uninitialization code in DefaultChannel easier to understand

.. by fixing bad / outdated method names