cl-adams/adams

diff --git a/core/defs.lisp b/core/defs.lisp
index 17836f5..17dce3d 100644
--- a/core/defs.lisp
+++ b/core/defs.lisp
@@ -153,9 +153,9 @@
 (define-resource-class host (resource-tree)
   ((shell :initarg :shell
 	  :type shell))
-  ((probe-os-using-uname :properties (os))
-   (probe-hostname :properties (hostname))
-   (probe-uptime :properties (uptime))))
+  ((probe-os-using-uname :properties (:os))
+   (probe-hostname :properties (:hostname))
+   (probe-uptime :properties (:uptime))))
 
 (defgeneric host-connect (host))
 (defgeneric host-disconnect (host))
diff --git a/core/host.lisp b/core/host.lisp
index bf4b5bb..2836da5 100644
--- a/core/host.lisp
+++ b/core/host.lisp
@@ -115,11 +115,11 @@
 		       (try name)
 		       (warn "Unknown OS : ~A" name)))))
       (when class
-	(list 'os (make-instance class
+	(list :os (make-instance class
 				 :machine machine
 				 :name name
 				 :release release
 				 :version version))))))
 
 (defmethod probe-hostname ((host host) (os os-unix))
-  (cons 'hostname (run "hostname")))
+  (cons :hostname (run "hostname")))
diff --git a/unix/defs.lisp b/unix/defs.lisp
index 189ec7e..fc61eea 100644
--- a/unix/defs.lisp
+++ b/unix/defs.lisp
@@ -19,24 +19,27 @@
 (in-package :adams)
 
 (define-resource-class group () ()
-  ((probe-group-in-/etc/group :properties (name passwd gid members))))
+  ((probe-group-in-/etc/group :properties (:name :passwd :gid :members))))
 
 (define-resource-class user ()
   ()
   ((probe-user-in-/etc/passwd :properties (login uid gid realname home shell))
-   (probe-user-groups-in-/etc/group :properties (groups))))
+   (probe-user-groups-in-/etc/group :properties (:groups))))
 
 (define-resource-class vnode ()
   ()
   ((probe-vnode-using-ls :properties (mode links owner group size mtime))
-   (probe-vnode-using-stat :properties (dev ino mode links uid gid rdev size
-                                        atime mtime ctime blksize blocks flags))))
+   (probe-vnode-using-stat :properties (:dev :ino :mode :links :uid :gid :rdev
+                                        :size :atime :mtime :ctime :blksize
+                                        :blocks :flags))))
 
-(defvar *cksum-legacy-algorithms*
-  '(cksum sum sysvsum))
+(eval-when (:compile-toplevel :load-toplevel :execute)
 
-(defvar *cksum-algorithms*
-  `(md4 md5 rmd160 sha1 sha224 sha256 sha384 sha512 ,@*cksum-legacy-algorithms*))
+  (defvar *cksum-legacy-algorithms*
+    '(:cksum :sum :sysvsum))
+
+  (defvar *cksum-algorithms*
+    `(:md4 :md5 :rmd160 :sha1 :sha224 :sha256 :sha384 :sha512 ,@*cksum-legacy-algorithms*)))
 
 (define-resource-class file (vnode)
   ()
@@ -47,4 +50,4 @@
 
 (define-resource-class directory (vnode)
   ()
-  ((probe-directory-content :properties (content))))
+  ((probe-directory-content :properties (:content))))
diff --git a/unix/probes.lisp b/unix/probes.lisp
index 2fab04c..86fa336 100644
--- a/unix/probes.lisp
+++ b/unix/probes.lisp
@@ -26,10 +26,10 @@
 	  (when (etypecase id
 		  (integer (= id gid))
 		  (string (string= id name)))
-	    (return (list 'name name
-			  'passwd passwd
-			  'gid gid
-			  'members members))))))
+	    (return (list :name name
+			  :passwd passwd
+			  :gid gid
+			  :members members))))))
 
 ;;  User
 
@@ -42,22 +42,22 @@
 	  (when (etypecase id
 		  (string (string= id login))
 		  (integer (= id uid)))
-	    (return (list 'login login 'uid uid 'gid gid
-			  'realname realname 'home home 'shell shell))))))
+	    (return (list :login login :uid uid :gid gid
+			  :realname realname :home home :shell shell))))))
 
 (defmethod probe-user-groups-in-/etc/group ((user user) (os os-unix))
   (let* ((id (resource-id user))
 	 (user-login (if (stringp id)
 			 id
-			 (get-probed user 'login)))
-	 (user-gid (get-probed user 'gid)))
+			 (get-probed user :login)))
+	 (user-gid (get-probed user :gid)))
     (iter (group<5> (name passwd gid members) in (grep user-login
 						       "/etc/group"))
 	  (with user-group = nil)
 	  (cond ((= user-gid gid) (setq user-group name))
 		((find user-login members :test #'string=) (collect name into groups)))
 	  (finally (let ((groups (sort groups #'string<)))
-		     (return (list 'groups (if user-group
+		     (return (list :groups (if user-group
 					       (cons user-group groups)
 					       groups))))))))
 
@@ -68,12 +68,12 @@
     (iter (ls<1>-lT (name mode links owner group size mtime)
 		    in (ls "-ldT" id))
 	  (when (string= id name)
-	    (return (list 'mode mode
-			  'links links
-			  'owner owner
-			  'group group
-			  'size size
-			  'mtime mtime))))))
+	    (return (list :mode mode
+			  :links links
+			  :owner owner
+			  :group group
+			  :size size
+			  :mtime mtime))))))
 
 (defmethod probe-vnode-using-stat ((vnode vnode) (os os-unix))
   (let ((id (resource-id vnode)))
@@ -81,20 +81,20 @@
 			   atime mtime ctime blksize blocks flags)
 		     in (stat "-r" id))
 	  (when (string= id name)
-	    (return (list 'dev dev
-			  'ino ino
-			  'mode (mode-string mode)
-			  'links links
-			  'uid uid
-			  'gid gid
-			  'rdev rdev
-			  'size size
-			  'atime atime
-			  'mtime mtime
-			  'ctime ctime
-			  'blksize blksize
-			  'blocks blocks
-			  'flags flags))))))
+	    (return (list :dev dev
+			  :ino ino
+			  :mode (mode-string mode)
+			  :links links
+			  :uid uid
+			  :gid gid
+			  :rdev rdev
+			  :size size
+			  :atime atime
+			  :mtime mtime
+			  :ctime ctime
+			  :blksize blksize
+			  :blocks blocks
+			  :flags flags))))))
 
 ;;  Regular file
 
@@ -113,14 +113,14 @@
                                             (sh-quote id)))
 				  (when ,(if legacy
                                              `(string= id name)
-                                             `(and (string= ',algorithm algo)
+                                             `(and (string= ,algorithm algo)
                                                    (string= id name)))
-				    (return (list ',algorithm sum)))))))))
+				    (return (list ,algorithm sum)))))))))
 
 (defgeneric probe-file-content (file os))
 
 (defvar *probe-file-content-size-limit* 8192)
 
 (defmethod probe-file-content ((file file) (os os-unix))
-  (when (< (get-probed file 'size) *probe-file-content-size-limit*)
-    (list 'content (run "cat ~A" (sh-quote (resource-id file))))))
+  (when (< (get-probed file :size) *probe-file-content-size-limit*)
+    (list :content (run "cat ~A" (sh-quote (resource-id file))))))