removing deprecated variable names