diff --git a/lisp/cedet/ede/base.el b/lisp/cedet/ede/base.el
index 4e27cd0cb69..599b855991d 100644
--- a/lisp/cedet/ede/base.el
+++ b/lisp/cedet/ede/base.el
@@ -627,14 +627,14 @@ instead of the current project."
   "Fills :directory or :file slots if they're missing in project THIS.
 The other slot will be used to calculate values.
 PROJECT-FILE-NAME is a name of project file (short name, like `pom.xml', etc."
-  (when (and (or (not (slot-boundp this :file))
-		 (not (oref this file)))
-	     (slot-boundp this :directory)
+  (when (and (not (and (slot-boundp this 'file)
+	               (oref this file)))
+	     (slot-boundp this 'directory)
 	     (oref this directory))
     (oset this file (expand-file-name project-file-name (oref this directory))))
-  (when (and (or (not (slot-boundp this :directory))
-		 (not (oref this directory)))
-	     (slot-boundp this :file)
+  (when (and (not (and (slot-boundp this 'directory)
+	               (oref this directory)))
+	     (slot-boundp this 'file)
 	     (oref this file))
     (oset this directory (file-name-directory (oref this file))))
   )
diff --git a/lisp/cedet/ede/emacs.el b/lisp/cedet/ede/emacs.el
index c51968ebb8c..ca91a7e4ffb 100644
--- a/lisp/cedet/ede/emacs.el
+++ b/lisp/cedet/ede/emacs.el
@@ -118,7 +118,7 @@ All directories need at least one target.")
   "Make sure the targets slot is bound."
   (cl-call-next-method)
   (unless (slot-boundp this 'targets)
-    (oset this :targets nil)))
+    (oset this targets nil)))
 
 ;;; File Stuff
 ;;
diff --git a/lisp/cedet/ede/generic.el b/lisp/cedet/ede/generic.el
index 162f37f9373..7c6e2ec715f 100644
--- a/lisp/cedet/ede/generic.el
+++ b/lisp/cedet/ede/generic.el
@@ -153,7 +153,7 @@ The class allocated value is replace by different sub classes.")
   "Make sure the targets slot is bound."
   (cl-call-next-method)
   (unless (slot-boundp this 'targets)
-    (oset this :targets nil))
+    (oset this targets nil))
   )
 
 (cl-defmethod ede-project-root ((this ede-generic-project))
diff --git a/lisp/cedet/ede/linux.el b/lisp/cedet/ede/linux.el
index d42f91c7500..34296972ddd 100644
--- a/lisp/cedet/ede/linux.el
+++ b/lisp/cedet/ede/linux.el
@@ -227,7 +227,7 @@ All directories need at least one target.")
   "Make sure the targets slot is bound."
   (cl-call-next-method)
   (unless (slot-boundp this 'targets)
-    (oset this :targets nil)))
+    (oset this targets nil)))
 
 ;;; File Stuff
 ;;
@@ -377,9 +377,9 @@ Argument COMMAND is the command to use for compiling the target."
 	 (inc (ede-linux--include-path dir bdir arch))
 	 (ver (ede-linux-version dir)))
     (oset this version ver)
-    (oset this :build-directory bdir)
-    (oset this :architecture arch)
-    (oset this :include-path inc)
+    (oset this build-directory bdir)
+    (oset this architecture arch)
+    (oset this include-path inc)
     ))
 
 (provide 'ede/linux)
diff --git a/lisp/cedet/ede/simple.el b/lisp/cedet/ede/simple.el
index f1f61c50421..3f7a359a445 100644
--- a/lisp/cedet/ede/simple.el
+++ b/lisp/cedet/ede/simple.el
@@ -86,7 +86,7 @@ ROOTPROJ is nil, since we will only create a single EDE project here."
 	(obj nil))
     (when pf
       (setq obj (eieio-persistent-read pf))
-      (oset obj :directory dir)
+      (oset obj directory dir)
       )
     obj))
 
diff --git a/lisp/cedet/srecode/map.el b/lisp/cedet/srecode/map.el
index 784e0c2d931..923cca4be0c 100644
--- a/lisp/cedet/srecode/map.el
+++ b/lisp/cedet/srecode/map.el
@@ -338,7 +338,7 @@ if that file is NEW, otherwise assume the mode has not changed."
     ;; Only do the save if we are dirty, or if we are in an interactive
     ;; Emacs.
     (when (and dirty (not noninteractive)
-	       (slot-boundp srecode-current-map :file))
+	       (slot-boundp srecode-current-map 'file))
       (eieio-persistent-save srecode-current-map))
     ))
 
diff --git a/lisp/cedet/srecode/srt-mode.el b/lisp/cedet/srecode/srt-mode.el
index 44c82e55b53..369730521e8 100644
--- a/lisp/cedet/srecode/srt-mode.el
+++ b/lisp/cedet/srecode/srt-mode.el
@@ -503,7 +503,7 @@ section or ? for an ask variable."
 	    (when inserter
 	      (let ((base
 		     (cons (oref inserter object-name)
-			   (if (and (slot-boundp inserter :secondname)
+			   (if (and (slot-boundp inserter 'secondname)
 				    (oref inserter secondname))
 			       (split-string (oref inserter secondname)
 					     ":")