more array->matrix renaming