(bluefox) support of new naming concept.