Further to previous fix for --(x/y)axis this further fix allows either standard_name, long_name or name to be used for the data.