SONAR-5010 rename some methods before publishing API