Fix to actually use axis labels if provided

Currently we are stuck with 'x' and 'y' as the labels.