artf668334 - Sonar Code Validation names Fixed