Fix auto rename on add in NGW