happy-clappy
Yes, Height=QFE, Altitude=QNH.
If at a FL and you are then descended to an altitude, then the QNH should also be included in that transmission. Likewise, when at an Altitude and you are decended to a height (assuming you are one of the few who still flies approaches on QFE), then the appropriate QFE should be included in that transmision.
If it is known you fly the approach on QNH, then the Threshold/Aerodrome elevation should also be passed to you at some stage during the the approach.