Some tokens share names with top-level entities

[ptorras]

The system itself works well because these tokens can be deambiguated by context. Nevertheless, having unique names makes it easier to use x-path navigation on the files, so it might be a necessary change on the long run.