Sonar improvements and class renaming