During the Tokugawa shogunate, samurai increasingly became courtiers, bureaucrats, and administrators rather than warriors. What was another name for the Tokugawa era?