Rename variables missed after refactor, add additional proxy sources