fix wrong variable names from the past