Change names from switch to array