Removes naming inconsistency with seemingly no purpose. Change-Id: I9f412e738b3b54e41dc208a131b44bb4c1c35a4c