few names changes