More names + map reference update