pep8 violation fix (shadowed identifier)
Translate locations <-> locators

unit tests and fixes they implied