diff --git a/basice2e/gateway-1.yaml b/basice2e/gateway-1.yaml
index 7b66bb1c1b5efea590ca1751d689265c0c2e3ca2..68f4d55fd700508da80cf16a613b879631fdaedd 100644
--- a/basice2e/gateway-1.yaml
+++ b/basice2e/gateway-1.yaml
@@ -12,7 +12,7 @@ log: "results/gateways/gateway-1.log"
 logLevel: 1
 
 # The public IP address and port of the node associated with this gateway
-cmixAddress: "127.0.0.1:50000"
+nodeAddress: "127.0.0.1:50000"
 
 # Port for Gateway to listen on. Gateway must be the only listener on this port.
 # Required field.
@@ -36,9 +36,9 @@ keyPath: "../keys/cmix.rip.key"
 # Path to the certificate file
 certPath: "../keys/cmix.rip.crt"
 # Path to the permissioning certificate
-schedulingCertPath: "../keys/cmix.rip.crt"
+permissioningCertPath: "../keys/cmix.rip.crt"
 # Path to the certificate file
-cmixCertPath: "../keys/cmix.rip.crt"
+serverCertPath: "../keys/cmix.rip.crt"
 
 devMode: true
 
diff --git a/basice2e/gateway-2.yaml b/basice2e/gateway-2.yaml
index 7ea7802ef7a38dcd72672eae4b4252b4d639a3db..d01a93fc8a21640425c4b816e0ef5ecf44d7b9cd 100644
--- a/basice2e/gateway-2.yaml
+++ b/basice2e/gateway-2.yaml
@@ -12,7 +12,7 @@ log: "results/gateways/gateway-2.log"
 logLevel: 1
 
 # The public IP address and port of the node associated with this gateway
-cmixAddress: "127.0.0.1:50001"
+nodeAddress: "127.0.0.1:50001"
 
 # Port for Gateway to listen on. Gateway must be the only listener on this port.
 # Required field.
@@ -36,9 +36,9 @@ keyPath: "../keys/cmix.rip.key"
 # Path to the certificate file
 certPath: "../keys/cmix.rip.crt"
 # Path to the permissioning certificate
-schedulingCertPath: "../keys/cmix.rip.crt"
+permissioningCertPath: "../keys/cmix.rip.crt"
 # Path to the certificate file
-cmixCertPath: "../keys/cmix.rip.crt"
+serverCertPath: "../keys/cmix.rip.crt"
 
 devMode: true
 
diff --git a/basice2e/gateway-3.yaml b/basice2e/gateway-3.yaml
index 406c15caf7f0313613f5726f64d8ebece49d48a4..954dbefd85d78b36b89c9e7f5b6a71777f14128f 100644
--- a/basice2e/gateway-3.yaml
+++ b/basice2e/gateway-3.yaml
@@ -12,7 +12,7 @@ log: "results/gateways/gateway-3.log"
 logLevel: 1
 
 # The public IP address and port of the node associated with this gateway
-cmixAddress: "127.0.0.1:50002"
+nodeAddress: "127.0.0.1:50002"
 
 # Port for Gateway to listen on. Gateway must be the only listener on this port.
 # Required field.
@@ -36,9 +36,9 @@ keyPath: "../keys/cmix.rip.key"
 # Path to the certificate file
 certPath: "../keys/cmix.rip.crt"
 # Path to the permissioning certificate
-schedulingCertPath: "../keys/cmix.rip.crt"
+permissioningCertPath: "../keys/cmix.rip.crt"
 # Path to the certificate file
-cmixCertPath: "../keys/cmix.rip.crt"
+serverCertPath: "../keys/cmix.rip.crt"
 
 devMode: true
 
diff --git a/basice2e/gateway-4.yaml b/basice2e/gateway-4.yaml
index a72048f84fc711deb60d3c6da0c9531265820f91..8a2e2d1091c6243cad3270598a748d179e530216 100644
--- a/basice2e/gateway-4.yaml
+++ b/basice2e/gateway-4.yaml
@@ -12,7 +12,7 @@ log: "results/gateways/gateway-4.log"
 logLevel: 1
 
 # The public IP address and port of the node associated with this gateway
-cmixAddress: "127.0.0.1:50003"
+nodeAddress: "127.0.0.1:50003"
 
 # Port for Gateway to listen on. Gateway must be the only listener on this port.
 # Required field.
@@ -36,9 +36,9 @@ keyPath: "../keys/cmix.rip.key"
 # Path to the certificate file
 certPath: "../keys/cmix.rip.crt"
 # Path to the permissioning certificate
-schedulingCertPath: "../keys/cmix.rip.crt"
+permissioningCertPath: "../keys/cmix.rip.crt"
 # Path to the certificate file
-cmixCertPath: "../keys/cmix.rip.crt"
+serverCertPath: "../keys/cmix.rip.crt"
 
 devMode: true
 
diff --git a/basice2e/gateway-5.yaml b/basice2e/gateway-5.yaml
index 353dc07cac669bbfaf990546b5617a2fd0530b18..079566e3d4f94756d156b40fa0f3a285c42bb581 100644
--- a/basice2e/gateway-5.yaml
+++ b/basice2e/gateway-5.yaml
@@ -12,7 +12,7 @@ log: "results/gateways/gateway-5.log"
 logLevel: 1
 
 # The public IP address and port of the node associated with this gateway
-cmixAddress: "127.0.0.1:50004"
+nodeAddress: "127.0.0.1:50004"
 
 # Port for Gateway to listen on. Gateway must be the only listener on this port.
 # Required field.
@@ -36,9 +36,9 @@ keyPath: "../keys/cmix.rip.key"
 # Path to the certificate file
 certPath: "../keys/cmix.rip.crt"
 # Path to the permissioning certificate
-schedulingCertPath: "../keys/cmix.rip.crt"
+permissioningCertPath: "../keys/cmix.rip.crt"
 # Path to the certificate file
-cmixCertPath: "../keys/cmix.rip.crt"
+serverCertPath: "../keys/cmix.rip.crt"
 
 devMode: true
 
diff --git a/basice2e/server-1.yaml b/basice2e/server-1.yaml
index 0315dc8ea35183d4e80047af5dfe74055f324a71..d920328d47c7f77819dc1010d0cf233e06b925cc 100644
--- a/basice2e/server-1.yaml
+++ b/basice2e/server-1.yaml
@@ -9,7 +9,7 @@ registrationCode: "qpol"
 useGPU: false
 devMode: true
 logLevel: 1
-cmix:
+node:
     paths:
         idf:  "results/servers/nodeID-1.json"
         cert: "../keys/cmix.rip.crt"
@@ -27,7 +27,7 @@ database:
 gateway:
     paths:
         cert: "../keys/cmix.rip.crt"
-scheduling:
+permissioning:
   paths:
     cert: "../keys/cmix.rip.crt"
   address: "127.0.0.1:18000"
diff --git a/basice2e/server-2.yaml b/basice2e/server-2.yaml
index 46cc443d5cfc76e27c7d38c5ed4891198b801d4b..9a7c110ec59861290e1b76dee05dfb8324b3f2ba 100644
--- a/basice2e/server-2.yaml
+++ b/basice2e/server-2.yaml
@@ -9,7 +9,7 @@ registrationCode: "yiiq"
 useGPU: false
 devMode: true
 logLevel: 1
-cmix:
+node:
     paths:
         idf:  "results/servers/nodeID-2.json"
         cert: "../keys/cmix.rip.crt"
@@ -27,7 +27,7 @@ database:
 gateway:
     paths:
         cert: "../keys/cmix.rip.crt"
-scheduling:
+permissioning:
   paths:
     cert: "../keys/cmix.rip.crt"
   address: "127.0.0.1:18000"
diff --git a/basice2e/server-3.yaml b/basice2e/server-3.yaml
index 2a2156037938bd1b4419e1fe374165a5d2d4af06..0935874fb496a4fd277685d1264cd476ac9641e1 100644
--- a/basice2e/server-3.yaml
+++ b/basice2e/server-3.yaml
@@ -9,7 +9,7 @@ registrationCode: "vydz"
 useGPU: false
 devMode: true
 logLevel: 1
-cmix:
+node:
     paths:
         idf:  "results/servers/nodeID-3.json"
         cert: "../keys/cmix.rip.crt"
@@ -27,7 +27,7 @@ database:
 gateway:
     paths:
         cert: "../keys/cmix.rip.crt"
-scheduling:
+permissioning:
   paths:
     cert: "../keys/cmix.rip.crt"
   address: "127.0.0.1:18000"
diff --git a/basice2e/server-4.yaml b/basice2e/server-4.yaml
index 46107242af7c642cff935276f42572947fd34d1f..7f32caee24e7b3f395d3bb7584c9c520bffc98d4 100644
--- a/basice2e/server-4.yaml
+++ b/basice2e/server-4.yaml
@@ -9,7 +9,7 @@ registrationCode: "gwxs"
 useGPU: false
 devMode: true
 logLevel: 1
-cmix:
+node:
     paths:
         idf:  "results/servers/nodeID-4.json"
         cert: "../keys/cmix.rip.crt"
@@ -27,7 +27,7 @@ database:
 gateway:
     paths:
         cert: "../keys/cmix.rip.crt"
-scheduling:
+permissioning:
   paths:
     cert: "../keys/cmix.rip.crt"
   address: "127.0.0.1:18000"
diff --git a/basice2e/server-5.yaml b/basice2e/server-5.yaml
index 42ac9214cd3a351606b3f773db01d8838b4a5647..494f901af46689de0a807f560eb459ea8516c737 100644
--- a/basice2e/server-5.yaml
+++ b/basice2e/server-5.yaml
@@ -9,7 +9,7 @@ registrationCode: "nahv"
 useGPU: false
 devMode: true
 logLevel: 1
-cmix:
+node:
     paths:
         idf:  "results/servers/nodeID-5.json"
         cert: "../keys/cmix.rip.crt"
@@ -27,7 +27,7 @@ database:
 gateway:
     paths:
         cert: "../keys/cmix.rip.crt"
-scheduling:
+permissioning:
   paths:
     cert: "../keys/cmix.rip.crt"
   address: "127.0.0.1:18000"
diff --git a/smokeinfra/gateway-1.yaml b/smokeinfra/gateway-1.yaml
index a305d5a2c3531830889df454ee51952897cef30d..259c700cb03eed032a73887743ffb33f3355c56e 100644
--- a/smokeinfra/gateway-1.yaml
+++ b/smokeinfra/gateway-1.yaml
@@ -12,7 +12,7 @@ log: "results/gatway-1.log"
 logLevel: 2
 
 # The public IP address and port of the node associated with this gateway
-cmixAddress: "127.0.0.1:60000"
+nodeAddress: "127.0.0.1:60000"
 
 # The public IPv4 address of the Gateway, as reported to the network, to use
 # instead of dynamically looking up Gateway's own IP address. If a port is not
@@ -36,9 +36,9 @@ keyPath: "../keys/cmix.rip.key"
 # Path to the certificate file
 certPath: "../keys/cmix.rip.crt"
 # Path to the permissioning certificate
-schedulingCertPath: "../keys/cmix.rip.crt"
+permissioningCertPath: "../keys/cmix.rip.crt"
 # Path to the certificate file
-cmixCertPath: "../keys/cmix.rip.crt"
+serverCertPath: "../keys/cmix.rip.crt"
 
 knownRoundsPath: "results/gateways/knownrounds-1.json"
 lastUpdateIdPath: "results/gateways/lastupdateid-1.txt"
diff --git a/smokeinfra/gateway-2.yaml b/smokeinfra/gateway-2.yaml
index 55d7de5a5b8494d2530cdebac790fec0a4a2da58..872f473865fe28c6127076a94ed6abba9b65e5b7 100644
--- a/smokeinfra/gateway-2.yaml
+++ b/smokeinfra/gateway-2.yaml
@@ -12,7 +12,7 @@ log: "results/gatway-2.log"
 logLevel: 2
 
 # The public IP address and port of the node associated with this gateway
-cmixAddress: "127.0.0.1:60001"
+nodeAddress: "127.0.0.1:60001"
 
 # The public IPv4 address of the Gateway, as reported to the network, to use
 # instead of dynamically looking up Gateway's own IP address. If a port is not
@@ -36,9 +36,9 @@ keyPath: "../keys/cmix.rip.key"
 # Path to the certificate file
 certPath: "../keys/cmix.rip.crt"
 # Path to the permissioning certificate
-schedulingCertPath: "../keys/cmix.rip.crt"
+permissioningCertPath: "../keys/cmix.rip.crt"
 # Path to the certificate file
-cmixCertPath: "../keys/cmix.rip.crt"
+serverCertPath: "../keys/cmix.rip.crt"
 
 knownRoundsPath: "results/gateways/knownrounds-2.json"
 lastUpdateIdPath: "results/gateways/lastupdateid-2.txt"
diff --git a/smokeinfra/gateway-3.yaml b/smokeinfra/gateway-3.yaml
index 2fb8822016acf788f7441594224c69a348eaf75b..0b014d75d8596466384e1f35bf8fcb92b726243e 100644
--- a/smokeinfra/gateway-3.yaml
+++ b/smokeinfra/gateway-3.yaml
@@ -12,7 +12,7 @@ log: "results/gatway-3.log"
 logLevel: 2
 
 # The public IP address and port of the node associated with this gateway
-cmixAddress: "127.0.0.1:60002"
+nodeAddress: "127.0.0.1:60002"
 
 # The public IPv4 address of the Gateway, as reported to the network, to use
 # instead of dynamically looking up Gateway's own IP address. If a port is not
@@ -36,9 +36,9 @@ keyPath: "../keys/cmix.rip.key"
 # Path to the certificate file
 certPath: "../keys/cmix.rip.crt"
 # Path to the permissioning certificate
-schedulingCertPath: "../keys/cmix.rip.crt"
+permissioningCertPath: "../keys/cmix.rip.crt"
 # Path to the certificate file
-cmixCertPath: "../keys/cmix.rip.crt"
+serverCertPath: "../keys/cmix.rip.crt"
 
 knownRoundsPath: "results/gateways/knownrounds-3.json"
 lastUpdateIdPath: "results/gateways/lastupdateid-3.txt"
diff --git a/smokeinfra/server-1.yaml b/smokeinfra/server-1.yaml
index b9e5757254d0ad963d971354bf77818b9e50c24e..d028aed259944f53c4bca941eab1ece30b6e4cf8 100644
--- a/smokeinfra/server-1.yaml
+++ b/smokeinfra/server-1.yaml
@@ -8,7 +8,7 @@
 registrationCode: "qpol"
 useGPU: false
 devMode: true
-cmix:
+node:
     paths:
         idf:  "nodeID-1.json"
         cert: "../keys/cmix.rip.crt"
@@ -26,7 +26,7 @@ database:
 gateway:
     paths:
         cert: "../keys/cmix.rip.crt"
-scheduling:
+permissioning:
   paths:
     cert: "../keys/cmix.rip.crt"
   address: "127.0.0.1:18000"
diff --git a/smokeinfra/server-2.yaml b/smokeinfra/server-2.yaml
index 0e43411ff49e745ba50c78f2848b9c3f1af00c71..474cdac09a0338c73d002424b807032e971736f8 100644
--- a/smokeinfra/server-2.yaml
+++ b/smokeinfra/server-2.yaml
@@ -8,7 +8,7 @@
 registrationCode: "yiiq"
 useGPU: false
 devMode: true
-cmix:
+node:
     paths:
         idf:  "nodeID-2.json"
         cert: "../keys/cmix.rip.crt"
@@ -26,7 +26,7 @@ database:
 gateway:
     paths:
         cert: "../keys/cmix.rip.crt"
-scheduling:
+permissioning:
   paths:
     cert: "../keys/cmix.rip.crt"
   address: "127.0.0.1:18000"
diff --git a/smokeinfra/server-3.yaml b/smokeinfra/server-3.yaml
index ed59ed90c352d43f12495b8abf5dfb5ca290ce3d..d987ea5abec097eb9c9dc6ab36ebc31aadb8dc21 100644
--- a/smokeinfra/server-3.yaml
+++ b/smokeinfra/server-3.yaml
@@ -8,7 +8,7 @@
 registrationCode: "vydz"
 useGPU: false
 devMode: true
-cmix:
+node:
     paths:
         idf:  "nodeID-3.json"
         cert: "../keys/cmix.rip.crt"
@@ -26,7 +26,7 @@ database:
 gateway:
     paths:
         cert: "../keys/cmix.rip.crt"
-scheduling:
+permissioning:
   paths:
     cert: "../keys/cmix.rip.crt"
   address: "127.0.0.1:18000"