Fix of VirtualDevice and naming in SwitchControlGenerator