Fixed namecleaning.