rename Make***Matrix -> Make***