Merge "Clean Sonar project name"