; (4) $168,098,139 for fiscal year 2024, including $124,203,295 for marine energy and $43,894,844 for hydropower research, development, and demonstration activities; and (5) $173,604,558 for fiscal year 2025, including $128,392,869 for marine energy and $45,211,689 for hydropower research, development, and demonstration activities. . (b) Conforming table of contents amendment The table of contents for the Energy Independence and Security Act of 2007 is amended by striking the items relating to subtitle C of title VI and inserting the following: Subtitle C—Water Power Research and Development Sec. 631. Short title. Sec. 632. Definitions. Sec. 633. Water power technology research, development, and demonstration. Sec. 634. Hydropower research, development, and demonstration. Sec. 635. Marine energy research, development, and demonstration. Sec. 636. National Marine Energy Centers. Sec. 637. Organization and administration of programs. Sec. 638. Applicability of other laws. Sec. 639. Authorization of appropriations. . 3. Conforming amendments (a) Energy policy act of 2005 The Energy Policy Act of 2005 ( 42 U.S.C. 15801 et seq.) is amended— (1) in section 201(a), by striking ocean (including tidal, wave, current, and thermal) and inserting marine ; (2) in section 203(b)(2)— (A) by striking ocean (including tidal, wave, current, and thermal) and inserting marine ; and (B) by adding at the end the following: For purposes of this Act, the term marine has the meaning given the term marine energy in section 632 of the Water Power Research and Development Act. ; (3) in section 931(a)(2)(E)(i), by striking ocean energy, including wave energy and inserting marine energy (as defined in section 632 of the Water Power Research and Development Act)