add back expressworks and reformat devices' names