Some names cleaning