yeah, in undergrad it was still called abnormal psychology, but we would go over the difference, and in my graduate school, I believe we called it psychopathology which to me is a much better term for it.
Don't forget 'eccentric' as a classification...many English people are eccentric though the Scots, Welsh and Irish aren't, they are just mad Celtic buggers.