Sonar Fixes: Variable name changes