Work on correcting unnamed element naming