Start working on namecleaning