Expected plugin to have ID "org.apache.cordova.device" but got "cordova-plugin-device"

I just started receiving this error from phonegap build today: Error: Expected plugin to have ID "org.apache.cordova.device" but got "cordova-plugin-device"

Looks like this line in plugin.xml is the problem. Can you update to latest dependency ID format?
<dependency id="org.apache.cordova.device" url="https://github.com/apache/cordova-plugin-device.git" />
