SONAR-4930 Update class name