Fix naming conventions for QA &  OV