Change namespace and filenames to remove *_matrix.