A. Upon the effective date of this act, Class Y shall include the following criminal offenses:
1. Murder in the first degree as provided for in subsection A of Section 701.7 of Title 21 of the Oklahoma Statutes;
2. Murder in the first degree during the commission of a crime, as provided for in subsection B of Section 701.7 of Title 21 of the Oklahoma Statutes;
3. Murder in the first degree when the death of a child results from willful or malicious injuring, torturing, maiming, or using unreasonable force, as provided for in subsection C of Section 701.7 of Title 21 of the Oklahoma Statutes;
4. Murder in the first degree when the person solicits another to cause the death of another human being in furtherance of unlawfully manufacturing, distributing, or dispensing a controlled dangerous substance, as provided for in subsection D of Section 701.7 of Title 21 of the Oklahoma Statutes;
5. Murder in the first degree when the person intentionally causes the death of a law enforcement officer, as provided for in subsection E of Section 701.7 of Title 21 of the Oklahoma Statutes; and 6. Murder in the first degree when a person kills another person or causes the death of another human being in the commission of an act of terrorism, as provided for in subsection C of Section 1268.2 of Title 21 of the Oklahoma Statutes. B. Any person convicted of a Class Y criminal offense set forth in this section shall be punished in accordance with the corresponding penalties provided for in the Oklahoma Statutes.