* Entity Registry to store and restore name/icon * Update test_entity_registry.py * Add original name/icon to JSON result