Changed object names to pre-2.2 format. Added a workaround for the unicode NULL character problem in cdc_datatypes.