Some names changes