; and (3) in subsection (c)— (A) in the header, by striking Near-Term and inserting Large-Scale ; and (B) in paragraph (4), by striking $95,000,000 for each of fiscal years 2008 through 2013 and inserting $2,500,000,000 for each of fiscal years 2021 through 2030 . 4. Model building code for electric vehicle supply equipment (a) Development The Secretary shall develop a proposal to establish or update, as appropriate, model building codes for— (1) integrating electric vehicle supply equipment into residential and commercial buildings that include space for individual vehicle or fleet vehicle parking; and (2) integrating onsite renewable power equipment and electric storage equipment (including electric vehicle batteries to be used for electric storage) into residential and commercial buildings. (b) Consultation In developing the proposal under subsection (a), the Secretary shall consult with stakeholders representing the building construction industry, manufacturers of electric vehicles and electric vehicle supply equipment, State and local governments, and any other persons with relevant expertise or interests. (c) Deadline Not later than 1 year after the date of enactment of this Act, the Secretary shall submit the proposal developed under subsection (a) to the American Society of Heating, Refrigerating, and Air Conditioning Engineers, the International Code Council, and the States for consideration. 5. Advanced technology vehicles manufacturing incentive program Section 136 of the Energy Independence and Security Act of 2007 ( 42 U.S.C. 17013 ) is amended— (1) in subsection (a)— (A) in paragraph (1)— (i) by redesignating subparagraphs (A) through (C) as clauses (i) through (iii), respectively, and indenting appropriately; (ii) by striking (1) Advanced technology vehicle .— and all that follows through meets— and inserting the following: (1) Advanced technology vehicle The term advanced technology vehicle means— (A) an ultra efficient vehicle; (B) a light duty vehicle that meets—