refactoring according to Dominic's note
https://github.com/w3c/web-platform-tests/pull/609#discussion-diff-10871258
Unifying  names of custom elements