adapt nomenclatures
Merge branch 'master' of https://github.com/ekylibre/ekylibre