Variable name change and test fix.