catacomb/__init__.py: Fix up cipher etc. names better.