Removing deprecated variable names.