Fountain update.  Update field names to match legacy expectations.
Cleanup java code.

Change-Id: I1ad9ae462e46166a7b6ff2b399417dbfe50a5542
4 files changed