Some variable had same name as type.

Change variable name or type name to resolve conflict.

Co-authored-by: Tomás Agustín González Orlando <tomasagustin.gonzalezorlando@arm.com>
Signed-off-by: Tuvshinzaya Erdenekhuu <tuvshinzaya.erdenekhuu@arm.com>
Signed-off-by: Tomás Agustín González Orlando <tomasagustin.gonzalezorlando@arm.com>
Change-Id: Ib9ad4b88b2695e6b4310ca890c9b0121f18ab4cd