J-72 Update property names to eliminate overlapping.

Change-Id: Ic7b9a1e362c2fdd29f9c44e001adae7e5d12baea