I think we should follow the late and much missed Iain M Banks' concept in naming military equipment. OK, so it may not adapt so well to the naming of aircraft types, but I still think the two CVFs should have been named "HMS Diplomacy Has Failed" and "HMS No More Mr Nice Guy".
PDR