fix element name for data keys