BVAL-343 Applying patch and updating tests
BVAL-343 Improving variable name