issue6871: improved variable name and string