WSOTWO-147: Fixed sonar issue related to shadowing of class fields by local variables