fixing instance names.