diff --git a/snippets/lisp-mode/defclass b/snippets/lisp-mode/defclass
deleted file mode 100644
index 38269de..0000000
--- a/snippets/lisp-mode/defclass
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: defclass
-# key: dc
-# --
-(defclass ${1:name} (${2:inherits})
-   (${4:slot})
-   (:documentation "${3:doc}"))
-$0
diff --git a/snippets/lisp-mode/defpackage b/snippets/lisp-mode/defpackage
deleted file mode 100644
index bffeab5..0000000
--- a/snippets/lisp-mode/defpackage
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Mark Karpov
-# name: my-defpackage
-# key: dp
-# --
-(defpackage     :${1:package}${2:
-  (:nicknames   ${3:nicks})}${4:
-  (:use         ${5:packages})}${6:
-  (:import-from ${7:packages})
-  (:shadow      ${8:packages})}${9:
-  (:export      ${10:packages})}${11:
-  (:documentation "${12:doc}")})
-$0
\ No newline at end of file
diff --git a/snippets/lisp-mode/my-defclass b/snippets/lisp-mode/my-defclass
new file mode 100644
index 0000000..d4e20a2
--- /dev/null
+++ b/snippets/lisp-mode/my-defclass
@@ -0,0 +1,8 @@
+# -*- mode: snippet -*-
+# contributor: Mark Karpov
+# name: my-defclass
+# key: dc
+# --
+(defclass ${1:name} (${2:parents})
+  ($0)${3:
+  (:documentation "${4:doc}")})
\ No newline at end of file
diff --git a/snippets/lisp-mode/defgeneric b/snippets/lisp-mode/my-defgeneric
similarity index 100%
rename from snippets/lisp-mode/defgeneric
rename to snippets/lisp-mode/my-defgeneric
diff --git a/snippets/lisp-mode/defmethod b/snippets/lisp-mode/my-defmethod
similarity index 100%
rename from snippets/lisp-mode/defmethod
rename to snippets/lisp-mode/my-defmethod
diff --git a/snippets/lisp-mode/my-defpackage b/snippets/lisp-mode/my-defpackage
new file mode 100644
index 0000000..86815c6
--- /dev/null
+++ b/snippets/lisp-mode/my-defpackage
@@ -0,0 +1,12 @@
+# -*- mode: snippet -*-
+# contributor: Mark Karpov
+# name: my-defpackage
+# key: dp
+# --
+(defpackage   :${1:package}${2:
+  (:nicknames ${3:nicks})}${4:
+  (:use       ${5:packages})}${6:
+  (:shadow    ${7:packages})}${8:
+  (:export    ${9:packages})}${10:
+  (:documentation "${11:doc}")})
+$0
\ No newline at end of file