Rename to singular
Merge branch 'master' into add-device-sources