Rename registerMessage -> registryMessage
Combine lookup logic in registry
Remove obsoleted code