rhbz1064106 - More variable renaming.