Fix wrong element-names