Removed server side mangling of the instance name.