Changed zone and instance names