Name scheme for new elements

Closes #527