Variable rename and test fix.