o More consistent naming of axis related arrays (one had prefix axis_, the others
  not).