refactor for scikit-learn renaming