Axis -> CategoricalAxis, ContinuousAxis will simplify the component code, and make consistent with the fact that the legend components will be split this way