Fixes #48 : renaming of constants