Merge "Fix Sonar name"