Merge "SF: Rename callbacks from SF to Scheduler to more generic name"