Few more changes of type_ to type in AnalysisType