Remove shadowing built in variables