CONFORMING AMENDMENTS.

SEC. 3006. CONFORMING AMENDMENTS. (a) Renewable Energy and Energy Efficiency Technology Competitiveness Act of 1989.— (1) National goals and multi-year funding.—Section 4 of the Renewable Energy and Energy Efficiency Technology Competitiveness Act of 1989 (42 U.S.C. 12003) is amended— (A) in the section heading, by striking “wind, photovoltaics, and solar thermal” and inserting “alcohol from biomass and other technology”; (B) in subsection (a)— (i) in the matter preceding paragraph (1), by striking “wind, photovoltaics, and solar thermal energy” and inserting “alcohol from biomass and other energy technology”; (ii) by striking paragraphs (1) through (3); (iii) by redesignating paragraphs (4) and (5) as paragraphs (1) and (2), respectively; and (iv) in paragraph (2) (as so redesignated), by striking “Ocean” and inserting “Marine”; and (C) in subsection (c)— (i) in the matter preceding paragraph (1)— (I) by striking “the Wind Energy Research Program, the Photovoltaic Energy Systems Program, the Solar Thermal Energy Systems Program,”; and (II) by striking “Ocean” and inserting “Marine”; (ii) in paragraph (1)— (I) by striking subparagraph (A); and (II) by redesignating subparagraphs (B) and (C) as subparagraphs (A) and (B), respectively; and (iii) in paragraph (2)— (I) by striking subparagraph (A); and (II) by redesignating subparagraphs (B) and (C) as subparagraphs (A) and (B), respectively. (2) Reports.—Section 9(c) of the Renewable Energy and Energy Efficiency Technology Competitiveness Act of 1989 (42 U.S.C. 12006(c)) is amended by striking “ocean,” and inserting “marine,”. (b) Energy Policy Act of 2005.—The Energy Policy Act of 2005 (42 U.S.C. 15801 et seq.) is amended— (1) Assessment of renewable energy resources.—Section 201(a) of the Energy Policy Act of 2005 (42 U.S.C. 15851(a)) is amended by striking “ocean (including tidal, wave, current, and thermal)” and inserting “marine”. (2) Federal purchase requirement.—Section 203(b)(2) of the Energy Policy Act of 2005 (42 U.S.C. 15852(b)(2)) is amended— (A) by inserting “marine energy (as defined in section 632 of the Energy Independence and Security Act of 2007), or” before “electric energy”; and (B) by striking “ocean (including tidal, wave, current, and thermal),”. (3) Renewable energy.—Section 931 of the Energy Policy Act of 2005 (42 U.S.C. 16231) is amended— (A) in subsection (a)(2)— (i) by striking subparagraphs (A) and (B); (ii) by redesignating subparagraphs (C) through (E) as subparagraphs (A) through (C), respectively; and (iii) in subparagraph (C)(i) (as so redesignated), by striking “ocean energy, including wave energy” and inserting “marine energy (as defined in section 632 of the Energy Independence and Security Act of 2007)”; (B) by striking subsection (d); and (C) by redesignating subsections (e) through (g) as subsections (d) through (f), respectively. (c) Energy Policy Act of 1992.—Section 1212 of the Energy Policy Act of 1992 (42 U.S.C. 13317) is amended— (1) in subsection (a)(4)(A)(i), by striking “ocean (including tidal, wave, current, and thermal)” and inserting “marine energy (as defined in section 632 of the Energy Independence and Security Act of 2007)”; (2) in subsection (b), in the matter preceding paragraph (1), by striking “ocean (including tidal, wave, current, and thermal)” and inserting “marine energy (as defined in section 632 of the Energy Independence and Security Act of 2007)”; and (3) in subsection (e)(1), in the first sentence, by striking “ocean (including tidal, wave, current, and thermal)” and inserting “marine energy (as defined in section 632 of the Energy Independence and Security Act of 2007)”. (d) Federal Nonnuclear Energy Research and Development Act of 1974.—Section 6(b)(3) of the Federal Nonnuclear Energy Research and Development Act of 1974 (42 U.S.C. 5905(b)(3)) is amended— (1) by striking subparagraph (L); and (2) by redesignating subparagraphs (M) through (S) as subparagraphs (L) through (R), respectively. (e) Solar Energy Research, Development, and Demonstration Act of 1974.— (1) [42 U.S.C. 6601 note] Repeal.—The Solar Energy Research, Development, and Demonstration Act of 1974 (42 U.S.C. 5551 et seq.) is repealed. (2) [42 U.S.C. 5551 note] Savings provision.—The repeal of the Solar Energy Research, Development, and Demonstration Act of 1974 (42 U.S.C. 5551 et seq.) under paragraph (1) shall not affect the authority of the Secretary of Energy to conduct research and development on solar energy. (f) [42 U.S.C. 5501 note] Solar Photovoltaic Energy Research, Development, and Demonstration Act of 1978.—The Solar Photovoltaic Energy Research, Development, and Demonstration Act of 1978 (42 U.S.C. 5581 et seq.) is repealed. (g) Energy Independence and Security Act of 2007.— (1) Repeals.—Sections 606 and 607 of the Energy Independence and Security Act of 2007 (42 U.S.C. 17174, 17175) are repealed. (2) Conforming amendment.—The table of contents in section 1(b) of the Energy Independence and Security Act of 2007 (Public Law 110-140; 121 Stat. 1495) is amended by striking the items relating to sections 606 and 607.