Refactors OSS scan parsing and renames method (AST-95414)

Refactors OSS scan parsing and renames method (AST-95414) #1338