more element name fixes