fix the screwed-up device names