naming structure update