applying terminology of java apis

Change-Id: Ia3720262c8e1f77d99ca0c80a9478833921a0bbc
4 files changed