Rename CDR classes