small simplification of rename from #3532 (#3539)
small simplification of rename from #3532 (#3539)


jhamman/xarray,markelg/xray,pydata/xarray,xray/xray,jhamman/xarray,markelg/xray,pydata/xarray,shoyer/xarray,shoyer/xarray,pydata/xarray,markelg/xray,jhamman/xarray