; (B) by striking In general in the heading of paragraph (1) and inserting Energy conservation measure ; and (C) by redesignating paragraph (2) as paragraph (4) and by inserting after paragraph (1) the following: (2) Water conservation measure For purposes of this section, the term water conservation measure means any installation or modification primarily designed to reduce consumption of water or to improve the management of water demand with respect to a dwelling unit. (3) Storm water management measure For purposes of this section, the term storm water management measure means any installation or modification of property primarily designed to reduce or manage amounts of storm water with respect to a dwelling unit. . (2) Definition of public utility Section 136(c)(4) of such Code (as redesignated by paragraph (1)(C)) is amended by striking subparagraph (B) and inserting the following: (B) Public utility The term public utility means a person engaged in the sale of electricity, natural gas, or water to residential, commercial, or industrial customers for use by such customers. (C) Storm water management provider The term storm water management provider means a person engaged in the provision of storm water management measures to the public. (D) Person For purposes of subparagraphs (B) and (C), the term person includes the Federal Government, a State or local government or any political subdivision thereof, or any instrumentality of any of the foregoing. . (3) Clerical amendments (A) The heading of section 136 of such Code is amended— (i) by inserting and water after energy ; and (ii) by striking provided by public utilities . (B) The item relating to section 136 in the table of sections of part III of subchapter B of chapter 1 of such Code is amended— (i) by inserting and water after energy