Rename add_guide_legend and add_guide_axis to add_legend and add_axis