ADEN-1153 Rename variables for Disaster Recovery
ADEN-1153 DR for IVW2 Analytics Provider refactoring