PLT-354 - Update identifiers from PR