Name refactoring for a better consistency