renaming all CDQ classes