Issue 495: Renamed DATAMATRIX to DATA_MATRIX for consistency.