Merge "Use better names for associated classes of RecoveryManager"