Revert "Correcting names"

This reverts commit dc7abca7aea10885882ec2a067378626ba2c815e.
Revert "Factor out deregistration code"

This reverts commit cf1f8bbdf1ada6cb7167cb7e635d7998a5a196fd.