; and (B) for storage water heaters under part C. (9) Technology-neutral electric storage water heater standards Notwithstanding any other provision of this Act, the Secretary may not create separate product classes for heat pump water heaters and other electric storage water heaters. . (c) Definition of commercial water heater Section 340 of the Energy Policy and Conservation Act ( 42 U.S.C. 6311 ) is amended by striking paragraph (12) and inserting the following: (12) (A) Storage water heater (i) In general The term storage water heater means a water heater that— (I) heats and stores water within an appliance at a thermostatically controlled temperature for delivery on demand; and (II) is not a water heater described in section 321(27)(A). (ii) Exclusion The term storage water heater does not include a unit with an input rating of 4,000 Btu per hour or more per gallon of stored water. (B) Instantaneous water heater The term instantaneous water heater means a water heater that— (i) has an input rating of at least 4,000 Btu per hour per gallon of stored water; and (ii) is not a water heater described in section 321(27)(A). (C) Unfired hot water storage tank The term unfired hot water storage tank means a tank used to store water that is heated externally. . (d) Labeling requirements Section 344 of the Energy Policy and Conservation Act ( 42 U.S.C. 6315 ) is amended by adding at the end the following: (l) Labels for certain commercial water heaters (1) In general Notwithstanding any other provision of this section, water heaters described in section 321(27)(B) shall be required to bear a permanent label, applied at the point of manufacture, that, subject to paragraph (3), satisfies the requirements described in paragraph (2). (2) Requirements A label required under paragraph (1) shall— (A) be made of material not adversely affected by water; (B) be attached by means of nonwater-soluble adhesive