in the definition of " hospital" for the words " Mental Health (Scotland) Act 1960" and " Part VII of the said Act of 1960" there shall be substituted the words " Mental Health (Scotland) Act 1984 " and " Part VIII of the said Act of 1984 " respectively;

in the definition of " mental disorder " for the words " section 6 of the Mental Health (Scotland) Act 1960 " there shall be substituted the words " section 1(2) of the Mental Health (Scotland) Act 1984 "; and

in the definition of " mental health officer " for the words " said Act of 1960 " there shall be substituted the words " said Act of 1984 ".