[Fed] Name fixes, and speaker consolidation.