The definition of mental disorder is changed by the MHA 2007, as of 3/11/08, so that it is no longer split into the four classifications of mental illness, psychopathic disorder, mental impairment and severe mental impairment.
s1 now states that:
There are, however, two exceptions. See these pages for details:
Table from Explanatory Notes, page 9.
Key: MI = mental illness, MM = mental impairment, PD = psychopathic disorder, SMM = severe mental impairment