( 7 U.S.C. 6g(e) ) is amended by striking exchange and inserting each designated contract market and swap execution facility . 404. Flexibility for registered entities Section 5c(b) of the Commodity Exchange Act ( 7 U.S.C. 7a–2(b) ) is amended by striking contract market, derivatives transaction execution facility, or electronic trading facility each place it appears and inserting registered entity . 405. Elimination of obsolete references to electronic trading facilities (a) Section 1a(19)(A)(x) of the Commodity Exchange Act ( 7 U.S.C. 1a(18)(A)(x) ), as so redesignated by section 304(b)(1) of this Act, is amended by striking (other than an electronic trading facility with respect to a significant price discovery contract) . (b) Section 1a(40) of such Act ( 7 U.S.C. 1a(41) ), as so redesignated by section 304(b)(1) of this Act, is amended— (1) by adding and at the end of subparagraph (D)