Better names for the curves only, more consistent