ENH: improve naming