changed var names to match changes in 2.5.1