Merge "SONAR TD - Remove unused fields, fix naming"