Fix name collisions.
Added strategies for reanalysis.