Fixed some remaining cdk references in avro files.