President Barack Obama announced on Friday that White House counsel Greg Craig will resign and named as his replacement Robert Bauer, a Democratic election lawyer who also has served as Obama’s personal lawyer.

Craig fell into disfavor with other top officials over his handling of Obama’s plan to close the Guantanamo Bay prison. The announcement, made in a written statement, came just hours after the president arrived in Japan for a weeklong trip to Asia.