Names restored to previous naming to allow retrocompatibility (that I broke myself)