changed naming a bit