Name change fixup.

Core:\n- ForceName flag will no longer let code flow run into deducting CPs.