Rename identifiers to comply with SDT and java coding standard.