Code Refactor. Avoid ambiguous report item names. 

Signed-off-by: Pengcheng Bian <pbian@actuate.com>