Fixed identically named variables leading to conflicts