; and (ii) to pay applicable charges relating to that water. (2) Inclusions The term water users' association includes— (A) an association; (B) a conservancy district; (C) an irrigation district; (D) a municipality; (E) a water project contract unit; and (F) any similar entity described in paragraph (1). (b) Prepayment of certain repayment contracts (1) Conversion and prepayment On receipt of a request from a party to the contract, the Secretary shall convert any water service contract in effect on the date of enactment of this Act between the United States and a water users' association to allow for prepayment of the contract pursuant to paragraph (2) under mutually agreeable terms and conditions, subject to the conditions that— (A) a water service contract entered into under subsection (e) of section 9 of the Act of August 4, 1939 (53 Stat. 1193, chapter 418), proposed to be converted under this subsection shall be converted to a repayment contract under subsection (d) of that section