Update and rename searchMatrix to SearchMatrix