Refactor axes naming code to fix y-axis name when current analysis is done