Makes numerous changes to the criminal law, including: (1) changing references from "county prosecuting attorney" to "prosecuting attorney"; (2) specifying the membership of county school safety commissions; (3) removing and replacing the organized theft statute; (4) increasing the penalty for fraud and battery under certain circumstances; and (5) defining "abusive head trauma" and permitting it to be used as an aggravating circumstance. Makes unlawful carrying of a handgun by a child a waivable offense. Specifies that "telephone sales call" includes certain types of electronically transmitted information. Makes certain other changes for consistency.