Moved axis name definitions around