Revert "Update convention"
Merge pull request #2 from mbenaissa/revert-1-dev

Revert "Update convention"