ldrp-v2: Change to handle descrepancy between tools usage

This change will handle the naming convention difference across
various tools. This is a temporary change till we move to a
consistent naming convention across the different tools.

Change-Id: I4279647a0f4eb08d2943106afabd3c1bcf06f749