Renamed Strategy
Update refactored function methods
Update refactored strategy references