(Bluefox) Support of new naming concept.