changed naming to be less confusing