Merge "Rename matrices for consistency"