A bunch of refactoring changes associated with 'experiment' to 'analysis' name change.