Fix issues around instance naming