Change cube cluster indexing to exactly match NDB output wire labeling