BZ-10485: change "facility or client name" to simply "client name"
BZ-10484: change "facility or client name" to simply "client name"