Hideyoshi reconstructed Obai-an after the sudden death of Nobunaga during the Honnoji Incident in 1582 but built Soken-in Temple, which was named after Sokeninden, the posthumous Buddhist name of Nobunaga, within the precinct of Daitoku-ji Temple as he believed that Obai-an Temple was too small to serve as the burial place of his master.
天正10年（1582年）の本能寺の変で信長が急逝すると秀吉は黄梅庵を改築するが、主君の塔所（墓所）としては規模が小さすぎるという理由で信長の法名・総見院殿の名を採り、大徳寺内に別に総見院を建立した。