RFR: JDK-8287886: Further terminology updates to match JLS

[Joe Darcy]

Work previously done under [JDK-8257638](https://bugs.openjdk.org/browse/JDK-8257638) missed some cases.

-------------

Commit messages:
 - JDK-8287886: Further terminology updates to match JLS

Changes: https://git.openjdk.java.net/jdk/pull/9052/files
 Webrev: https://webrevs.openjdk.java.net/?repo=jdk&pr=9052&range=00
  Issue: https://bugs.openjdk.org/browse/JDK-8287886
  Stats: 63 lines in 6 files changed: 3 ins; 0 del; 60 mod
  Patch: https://git.openjdk.java.net/jdk/pull/9052.diff
  Fetch: git fetch https://git.openjdk.java.net/jdk pull/9052/head:pull/9052

PR: https://git.openjdk.java.net/jdk/pull/9052