switch (and lazily convert) ivar names to 3.x

Fixes https://github.com/rails/rails/issues/9494