Renamed variables to avoid DEBUG collision
New builds