Renamed some macros
Merge branch 'master' of https://github.com/Piot/peal