JFZ90, as regarding lumping things together, the definition of airworthiness is:
The ability of an aircraft or other airborne equipment or system to operate
without significant hazard to aircrew, ground crew, passengers (where relevant) or to the
general public over which such airborne systems are flown.
Seems to lump them together nicely.
sw