This bill modifies the definition of water heater, otherwise revises energy conservation standards, and sets forth labeling requirements for water heaters. In addition, it directs the Department of Energy to determine whether electric storage water heaters should possess demand response capabilities.