Fix privilege names and file headers
Partial post-merge cleanup of devices module