Rename constants used
Merge branch 'PIM-2803' of git://github.com/akeneo/pim-community-dev into PIM-2803