Rename add_guide_legend and add_guide_axis to guide_legend and guide_axis