dclass: Update CMakeLists for changed names.  Begin fixing compile errors.