Rename 'KeyRegistry' to 'Registry' as this is the main reg registry.
Fix the doctests.