Fix instances names resolution