Modify variable names
Make warnings noisier as we get closer to 1.0