important fix, changed naming to avoid accidental aliasing