Fixed variable names due to core update