Merge "Sonar improvements and class renaming"