Made names in classify.py consistent with thoses in nb.py