Unfortunately, there are a distinctly limited number of words that can communicate a particular concept - the pigeon-hole principle suggests duplication will be inevitable.
Ambiguity's only really a problem when the same term is used multiple ways in similar contexts. I think it's very unlikely that anyone will get confused between these two usages.