Moving code around and renaming things. Goes hand-in-hand with a PR in the Elasticsearch repository that introduces the corresponding Java classes: elastic/elasticsearch#32171