Using underscores in element names instead of camel case
Merge branch 'mbst-9888-resolution-api' into stage