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