MT#8215 Update elasticsearch fields name to final version

Change-Id: I9026dee51772d852dd1ac6a93c17313684fd5eb5