Changes to setName method to support ADS consistency. Re #6199