JAL-1140 bugfix - getDataName throws errors - prefer to use the name given by the...