Renamed *MatrixNavigator to *MatrixData