modify names and add basic devices