Yima's Var and Gymis Fort and Gilgamesh

"And the Eddas have preserved us the tradition that this "Fort of Gymis" consisted of a collection of underground burrows and "cellars," and its fort was presumably a stockade. But the Eddas add that after its capture it was made into a city by Thor and his descendants." - L.A. Waddell, The Makers of History and Civilization

Could Gymis' Fort with its underground burrows and cellars, and Gilgamesh's walled city parallel to Yima's Var .  And could Av. Var, and Av. Vorukasha be a cognates of Ur and Uruq respectively?