Virtual Switchboard - Shows Up As Both Plug and Switch in Amazon Alexa

So something changed. Have devices, such as Virtual Switchboard default device, showing up twice in Alexa as a plug and switch when device discovery is used via Alexa app. They are both linked as disabling one in Alexa disables both. Anyone know anything about this? Anyway to “link these so they are a single device?