diff --git a/build.scm b/build.scm
index 2ca1831..de9966a 100644
--- a/build.scm
+++ b/build.scm
@@ -11,7 +11,7 @@
 
 (define full-library-command
   (lambda (implementation test)
-    (let* ((name (symbol->string (cdr (assoc 'name implementation))))
+    (let* ((name (cdr (assoc 'name implementation)))
            (library-command (assoc 'library-command implementation)))
       (cond ((not library-command) #f)
             ; Note that Chicken needs to have the SRFI library as srfi-N.scm in same folder
@@ -37,7 +37,7 @@
 
 (define full-command
   (lambda (implementation test)
-    (let* ((name (symbol->string (cdr (assoc 'name implementation))))
+    (let* ((name (cdr (assoc 'name implementation)))
            (test-name (cdr (assoc 'name test)))
            (test-file (cdr (assoc 'file test)))
            (command
@@ -69,7 +69,7 @@
     (newline out)
     (for-each
       (lambda (implementation)
-        (let ((name (symbol->string (cdr (assoc 'name implementation)))))
+        (let ((name (cdr (assoc 'name implementation))))
           (execute jenkinsfile-job-top
                    `((name . ,name)
                      (dockerimage . ,(if (assoc 'docker-image implementation)
@@ -103,7 +103,7 @@
       (lambda (test)
           (for-each
             (lambda (implementation)
-              (let* ((name (symbol->string (cdr (assoc 'name implementation)))))
+              (let* ((name (cdr (assoc 'name implementation))))
                 (execute makefile-job
                          `((name . ,name)
                            (test-name . ,(cdr (assoc 'name test)))
diff --git a/implementations.scm b/implementations.scm
index 272f6ed..dbeaf8d 100644
--- a/implementations.scm
+++ b/implementations.scm
@@ -1,25 +1,25 @@
 
 (define implementations
-  '(((name . chibi) (command . "chibi-scheme -I ./snow/chibi"))
-    ((name . chicken)
+  '(((name . "chibi") (command . "chibi-scheme -I ./snow/chibi"))
+    ((name . "chicken")
      (command . "csc -include-path ./snow/chibi -X r7rs -R r7rs")
      (library-command . "csc -include-path ./snow/chibi -include-path ./snow/chibi/term -X r7rs -R r7rs -s -J"))
-    ((name . cyclone)
+    ((name . "cyclone")
      (command . "cyclone -A .")
      (library-command . "cyclone -A ."))
-    ((name . gambit)
+    ((name . "gambit")
      (command . "gsc -exe . -nopreload")
      (library-command . "gsc ."))
-    ((name . gauche) (command . "gosh -r7 -A ./snow"))
-    ((name . guile) (command . "guile --fresh-auto-compile --r7rs -L . -L ./snow"))
-    ((name . kawa) (command . "kawa --r7rs -Dkawa.import.path=./snow/chibi/*.sld:./snow/srfi/*.sld"))
-    ((name . loko)
+    ((name . "gauche") (command . "gosh -r7 -A ./snow"))
+    ((name . "guile") (command . "guile --fresh-auto-compile --r7rs -L . -L ./snow"))
+    ((name . "kawa") (command . "kawa --r7rs -Dkawa.import.path=./snow/chibi/*.sld:./snow/srfi/*.sld"))
+    ((name . "loko")
      (docker-image . "schemers/loko:head")
      (command . "LOKO_LIBRARY_PATH=./snow loko -std=r7rs --compile")
      ; Library command so the executable gets run
      (library-command . "ls"))
-    ((name . mit-scheme) (command . "mit-scheme --load"))
-    ((name . sagittarius) (command . "sash -r7 -L ./snow"))
-    ((name . stklos) (command . "stklos -I ./snow"))
-    ((name . skint) (command . "skint --program"))
-    ((name . tr7) (command . "tr7i"))))
+    ((name . "mit-scheme") (command . "mit-scheme --load"))
+    ((name . "sagittarius") (command . "sash -r7 -L ./snow"))
+    ((name . "stklos") (command . "stklos -I ./snow"))
+    ((name . "skint") (command . "skint --program"))
+    ((name . "tr7") (command . "tr7i"))))
diff --git a/report.scm b/report.scm
index 9714ee9..d3c13da 100644
--- a/report.scm
+++ b/report.scm
@@ -28,25 +28,25 @@
     (display "<th>Test</th>" out)
     (for-each
       (lambda (implementation)
-        (display (string-append "<th>" (symbol->string (cdr (assoc 'name implementation))) "</th>") out)
+        (display (string-append "<th>" (cdr (assoc 'name implementation)) "</th>") out)
         (newline out))
       implementations)
     (display "</tr>" out)
     (newline out)
     (newline out)
     (for-each
-      (lambda (test)
-        (let ((test-name (cdr (assoc 'name test))))
+      (lambda (implementation)
+        (let ((name (cdr (assoc 'name implementation))))
           (display (string-append "<tr>") out)
           (newline out)
-          (display (string-append "<td>" test-name "</td>") out)
+          (display (string-append "<td>" name "</td>") out)
           (newline out)
           (for-each
-            (lambda (implementation)
-              (letrec* ((name (cdr (assoc 'name implementation)))
+            (lambda (test)
+              (letrec* ((test-name (cdr (assoc 'name test)))
                         (command (cdr (assoc 'command implementation)))
                         (logfile (string-append "reports/"
-                                                (symbol->string (cdr (assoc 'name implementation)))
+                                                name
                                                 "-"
                                                 test-name
                                                 ".log"))
@@ -78,8 +78,8 @@
                            (result . ,result))
                          out)
                 (newline out)))
-            implementations)
+            tests)
           (display (string-append "</tr>") out)))
-      tests)
+      implementations)
     (execute report-bottom '() out)
     (newline out)))