rename def vars to not shadow core/first, etc.
Merge pull request #380 from davidrupp/master

rename def vars to not shadow core/first, etc.