Changes to the cmodel vars and hook names to comply with the new names.