updated diagram with names changes