ice2x01;
Your answer is correct. I wouldn't worry about the ICAO definition because, even if there is one, it is not relevant. Airplanes are certificated according to the definitions used in the code(s) of airworthiness applicable in (a) particular state(s).
Regards,
HN39