fixes ZEN-13733: fix variable shadowing of endpoints
Merge pull request #921 from control-center/feature/ZEN-13733

fixes ZEN-13733: fix variable shadowing of endpoints