rename for-matrix -> matrix-for