SONAR-1896 Rename names of properties