Email name fixes.