Renamed conflicting variables