Make macro names consistent: use - instead of _
Merge branch 'master' of github.com:rasselin/os-ext-testing