More element name standardizing