; (17) in section 240(c)(3)— (A) by striking service in the heading and inserting government ; and (B) by striking Service in each place such term appears and inserting Government ; (18) in section 240(c)(7)(C)(iv)(II)— (A) by striking Attorney General and inserting immigration judge ; and (B) by striking Immigration and Naturalization Service and inserting Secretary of Homeland Security ; (19) in section 240(c)(7)(C)(iv)(III)— (A) by striking Attorney General and inserting immigration judge ; and (B) by striking Attorney General’s and inserting immigration judge’s ; (20) in section 240(d) by amending the first sentence to read as follows: An immigration judge may enter an order of removal stipulated to by the alien (or the alien’s representative) and the Government. ; (21) in section 242(a)(2)(A) by striking Attorney General in each place such term appears and inserting Secretary of Homeland Security ; (22) in section 242(a)(2)(B)(ii), by striking Attorney General each place it appears and inserting the appellate division of the Immigration Courts ; (23) in section 242(a), by adding at the end the following: (6) Venue For purposes of judicial review under this section and section 625(d), the venue of a proceeding before the court of appeals is in the judicial circuit in which— (A) an immigration trial judge of the Immigration Court issued the original underlying decision in the matter; or (B) the underlying administrative action reviewed by the appellate division of the Court occurred. ; (24) in section 242(b)(2) by inserting trial after immigration ; (25) in section 242(b)(3)(A)— (A) by striking Attorney General in the first sentence and inserting United States ; and (B) by amending the second sentence to read as follows: The petition shall be served on the Attorney General and on the officer or employee of the Department of Homeland Security in charge of the district in which the final order of removal under section 240 was entered.