Changed from display names to UUID's.