Locator: Rename variables for consistency

Change-Id: Ifc2228b4b18a8ce6ba19390f796f1f3c05e381d4
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: hjk <hjk121@nokiamail.com>