OTA fix to include all of the supported device names in asserts