ENH: renaming for clarity