Some names modified