Updated PQ model that complies with naming conventions