Renaming cdr classes