Fix up registration and unloc names.