2 files changed, 3 insertions, 2 deletions

diff --git a/lisp/cedet/ede.el b/lisp/cedet/ede.el
index 22374dd6a63..d051510a994 100644
--- a/lisp/cedet/ede.el
+++ b/lisp/cedet/ede.el
@@ -791,7 +791,7 @@ Optional argument NAME is the name to give this project."
                  ))
          (inits (oref obj initializers)))
     ;; Force the name to match for new objects.
-    (eieio-object-set-name-string nobj (oref nobj name))
+    (setf (slot-value nobj 'object-name) (oref nobj name))
     ;; Handle init args.
     (while inits
       (eieio-oset nobj (car inits) (car (cdr inits)))
diff --git a/lisp/cedet/ede/auto.el b/lisp/cedet/ede/auto.el
index 4871d51bc64..099d60fffa7 100644
--- a/lisp/cedet/ede/auto.el
+++ b/lisp/cedet/ede/auto.el
@@ -31,6 +31,7 @@
 
 (require 'eieio)
 (require 'cl-generic)
+(require 'eieio-base)
 
 (declare-function ede-directory-safe-p "ede")
 (declare-function ede-add-project-to-global-list "ede")
@@ -136,7 +137,7 @@ into memory.")
 (declare-function ede-directory-safe-p "ede")
 (declare-function ede-add-project-to-global-list "ede")
 
-(defclass ede-project-autoload ()
+(defclass ede-project-autoload (eieio-named)
   ((name :initarg :name
          :documentation "Name of this project type")
    (file :initarg :file