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