Adjust table generator to new ivar naming convention.