Refactored calcTargets names