changed naming structure