Fix instance names