Rename element-type to element-name