rename element names to be more unique