Updates and avoid name conflicts