diff --git a/basice2e/gateway-1.yaml b/basice2e/gateway-1.yaml
index 4c49dc588e84a000f53133aa1256707864b19e76..4a99975008c38bd56993cbfca965dbf449d13bf4 100644
--- a/basice2e/gateway-1.yaml
+++ b/basice2e/gateway-1.yaml
@@ -11,7 +11,7 @@ log: "results/gateways/gatway-1.log"
 # Log message level
 logLevel: 1
 
-GatewayNode: "127.0.0.1:50000"
+Node: "127.0.0.1:50000"
 
 # The listening address of this gateway
 Port: 8440
diff --git a/basice2e/gateway-2.yaml b/basice2e/gateway-2.yaml
index ef3f3964b4685d9a2a437edb4f568c86c25e11a4..fd1dabfaa42c2b756ac7488b30c0c93d73f8d721 100644
--- a/basice2e/gateway-2.yaml
+++ b/basice2e/gateway-2.yaml
@@ -11,7 +11,7 @@ log: "results/gateways/gatway-2.log"
 # Log message level
 logLevel: 1
 
-GatewayNode: "127.0.0.1:50001"
+Node: "127.0.0.1:50001"
 
 # The listening address of this gateway
 Port: 8441
diff --git a/basice2e/gateway-3.yaml b/basice2e/gateway-3.yaml
index 8554207139aaeed380bde0b8cebc8e7d9664e2f8..8a12bdf28582b631528cb7f7775547d01f5d0513 100644
--- a/basice2e/gateway-3.yaml
+++ b/basice2e/gateway-3.yaml
@@ -11,7 +11,7 @@ log: "results/gateways/gatway-3.log"
 # Log message level
 logLevel: 1
 
-GatewayNode: "127.0.0.1:50002"
+Node: "127.0.0.1:50002"
 
 # The listening address of this gateway
 Port: 8442
diff --git a/basice2e/gateway-4.yaml b/basice2e/gateway-4.yaml
index b0d5c89c4e33c48e8b68b65281603f9f2ce954f8..50480adc119a5308a18f4f88863752e94c4f5dbc 100644
--- a/basice2e/gateway-4.yaml
+++ b/basice2e/gateway-4.yaml
@@ -11,7 +11,7 @@ log: "results/gateways/gatway-4.log"
 # Log message level
 logLevel: 1
 
-GatewayNode: "127.0.0.1:50003"
+Node: "127.0.0.1:50003"
 
 # The listening address of this gateway
 Port: 8443
diff --git a/basice2e/gateway-5.yaml b/basice2e/gateway-5.yaml
index 1025e51d5649fca22f0200d7ed95be64bb820852..9b28586d388e78b4f53e2be15db1732717811b70 100644
--- a/basice2e/gateway-5.yaml
+++ b/basice2e/gateway-5.yaml
@@ -11,7 +11,7 @@ log: "results/gateways/gatway-5.log"
 # Log message level
 logLevel: 1
 
-GatewayNode: "127.0.0.1:50004"
+Node: "127.0.0.1:50004"
 
 # The listening address of this gateway
 Port: 8444
diff --git a/smokeinfra/gateway-1.yaml b/smokeinfra/gateway-1.yaml
index d3a4b82ab6330df6767e79d683565df552fa4dc9..d76d125120243ed1f86f80c0be9fdf53ad6816b1 100644
--- a/smokeinfra/gateway-1.yaml
+++ b/smokeinfra/gateway-1.yaml
@@ -12,7 +12,7 @@ log: "results/gateway-1.log"
 logLevel: 1
 
 # The cMix nodes in the network
-GatewayNode: "localhost:60000"
+Node: "localhost:60000"
 
 # The listening address of this gateway
 Port: 9440
diff --git a/smokeinfra/gateway-2.yaml b/smokeinfra/gateway-2.yaml
index a6e9398f6b40c846d358f995a33a428491472203..bca4a80c6245b0e96e11ff7f079d9ae481ad0a64 100644
--- a/smokeinfra/gateway-2.yaml
+++ b/smokeinfra/gateway-2.yaml
@@ -11,7 +11,7 @@ log: "results/gateway-2.log"
 # Log message level
 logLevel: 1
 
-GatewayNode: "localhost:60001"
+Node: "localhost:60001"
 
 # The listening address of this gateway
 Port: 9441
diff --git a/smokeinfra/gateway-3.yaml b/smokeinfra/gateway-3.yaml
index 0aca126b86ddb3ff75c4f2c9e40e8a7693a01f9a..a3b74a779123c651b2080f73ec0c531bc5ced314 100644
--- a/smokeinfra/gateway-3.yaml
+++ b/smokeinfra/gateway-3.yaml
@@ -11,7 +11,7 @@ log: "results/gateway-3.log"
 # Log message level
 logLevel: 1
 
-GatewayNode: "localhost:60002"
+Node: "localhost:60002"
 
 # The listening address of this gateway
 Port: 9442