Fixing instance rename