Fix deprecated variable names