SONAR-4535 Rename some method
Fix quality flaws