i dont no whether they are the same mate, someone should be able to tell you on here! do you no for sure its the uj's?
i have a clunking on my defender, i dont no if im right in saying but i think if you take propshaft off with the suspecting damaged uj, and have quick drive round to listen for...