diff --git a/Jenkinsfile b/Jenkinsfile
index ff90069..15f61d0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -28,15 +28,15 @@ pipeline {
                 script {
                     def config = readYaml file: 'buildconfig.yaml'
                     config.schemes.each { scheme ->
-                        stage("${scheme}") {
+                        stage("${scheme.name}") {
                             agent {
                                 docker {
                                     image "schemers/${scheme}:${scheme.docker-tag}"
                                 }
                             }
                             environment {
-                                COMPILE_R7RS="${scheme}"
-                                SCHEME="${scheme}"
+                                COMPILE_R7RS="${scheme.scheme}"
+                                SCHEME="${scheme.scheme}"
                             }
                             scheme.stages.each { stage ->
                                 stage("${stage}") {
diff --git a/buildconfig.yaml b/buildconfig.yaml
index db949fc..ffc74b2 100644
--- a/buildconfig.yaml
+++ b/buildconfig.yaml
@@ -1,5 +1,6 @@
 schemes:
-- scheme: chibi
+- name: Chibi
+  scheme: chibi
   docker-tag: head
   init-cmd: |
     apt-get update && apt-get install -y git ca-certificates gcc make libffi-dev