Issue #1363112 by mparker17, mgifford, tlattimore, Jacine, dcmouyard, bowersox, ry5n, ahdiaz: Simplify names of 'element-x' helper classes.