Rename identifiers to comply with SDT and java coding standard.
Merge branch 'master' into AIDA-91-select-report-to-generate
Rename identifiers to comply with SDT and java coding standard.