change names to simpler