Fixed name analysis.