Use uniform snake case in the configs, fix critical issue with wrong

calculation of workers in stack at the Destroy stage

42 files changed, 270 insertions, 250 deletions

diff --git a/.rr.yaml b/.rr.yaml
index bedfca7c..2de60b86 100755
--- a/.rr.yaml
+++ b/.rr.yaml
@@ -9,7 +9,7 @@ server:
     "RR_HTTP": "true"
     "RR_RPC": "tcp://127.0.0.1:6001"
   relay: "pipes"
-  relayTimeout: "20s"
+  relay_timeout: "20s"
 
 logs:
   mode: development
diff --git a/pkg/worker_watcher/stack.go b/pkg/worker_watcher/stack.go
index 55f1f52a..788750dc 100644
--- a/pkg/worker_watcher/stack.go
+++ b/pkg/worker_watcher/stack.go
@@ -10,17 +10,19 @@ import (
 )
 
 type Stack struct {
-	workers            []worker.BaseProcess
-	mutex              sync.RWMutex
-	destroy            bool
-	actualNumOfWorkers int64
+	workers             []worker.BaseProcess
+	mutex               sync.RWMutex
+	destroy             bool
+	actualNumOfWorkers  uint64
+	initialNumOfWorkers uint64
 }
 
-func NewWorkersStack() *Stack {
+func NewWorkersStack(initialNumOfWorkers uint64) *Stack {
 	w := runtime.NumCPU()
 	return &Stack{
-		workers:            make([]worker.BaseProcess, 0, w),
-		actualNumOfWorkers: 0,
+		workers:             make([]worker.BaseProcess, 0, w),
+		actualNumOfWorkers:  0,
+		initialNumOfWorkers: initialNumOfWorkers,
 	}
 }
 
@@ -113,7 +115,7 @@ func (stack *Stack) Destroy(ctx context.Context) {
 		case <-tt.C:
 			stack.mutex.Lock()
 			// that might be one of the workers is working
-			if len(stack.workers) != int(stack.actualNumOfWorkers) {
+			if stack.initialNumOfWorkers != stack.actualNumOfWorkers {
 				stack.mutex.Unlock()
 				continue
 			}
diff --git a/pkg/worker_watcher/stack_test.go b/pkg/worker_watcher/stack_test.go
index 7cdb88f1..86af2043 100644
--- a/pkg/worker_watcher/stack_test.go
+++ b/pkg/worker_watcher/stack_test.go
@@ -3,6 +3,7 @@ import (
 	"context"
 	"os/exec"
 	"testing"
+	"time"
 
 	"github.com/spiral/roadrunner/v2/interfaces/worker"
 	workerImpl "github.com/spiral/roadrunner/v2/pkg/worker"
@@ -10,37 +11,37 @@ import (
 )
 
 func TestNewWorkersStack(t *testing.T) {
-	stack := NewWorkersStack()
-	assert.Equal(t, int64(0), stack.actualNumOfWorkers)
+	stack := NewWorkersStack(0)
+	assert.Equal(t, uint64(0), stack.actualNumOfWorkers)
 	assert.Equal(t, []worker.BaseProcess{}, stack.workers)
 }
 
 func TestStack_Push(t *testing.T) {
-	stack := NewWorkersStack()
+	stack := NewWorkersStack(1)
 
 	w, err := workerImpl.InitBaseWorker(&exec.Cmd{})
 	assert.NoError(t, err)
 
 	stack.Push(w)
-	assert.Equal(t, int64(1), stack.actualNumOfWorkers)
+	assert.Equal(t, uint64(1), stack.actualNumOfWorkers)
 }
 
 func TestStack_Pop(t *testing.T) {
-	stack := NewWorkersStack()
+	stack := NewWorkersStack(1)
 	cmd := exec.Command("php", "../tests/client.php", "echo", "pipes")
 
 	w, err := workerImpl.InitBaseWorker(cmd)
 	assert.NoError(t, err)
 
 	stack.Push(w)
-	assert.Equal(t, int64(1), stack.actualNumOfWorkers)
+	assert.Equal(t, uint64(1), stack.actualNumOfWorkers)
 
 	_, _ = stack.Pop()
-	assert.Equal(t, int64(0), stack.actualNumOfWorkers)
+	assert.Equal(t, uint64(0), stack.actualNumOfWorkers)
 }
 
 func TestStack_FindAndRemoveByPid(t *testing.T) {
-	stack := NewWorkersStack()
+	stack := NewWorkersStack(1)
 	cmd := exec.Command("php", "../tests/client.php", "echo", "pipes")
 	w, err := workerImpl.InitBaseWorker(cmd)
 	assert.NoError(t, err)
@@ -48,27 +49,27 @@ func TestStack_FindAndRemoveByPid(t *testing.T) {
 	assert.NoError(t, w.Start())
 
 	stack.Push(w)
-	assert.Equal(t, int64(1), stack.actualNumOfWorkers)
+	assert.Equal(t, uint64(1), stack.actualNumOfWorkers)
 
 	stack.FindAndRemoveByPid(w.Pid())
-	assert.Equal(t, int64(0), stack.actualNumOfWorkers)
+	assert.Equal(t, uint64(0), stack.actualNumOfWorkers)
 }
 
 func TestStack_IsEmpty(t *testing.T) {
-	stack := NewWorkersStack()
+	stack := NewWorkersStack(1)
 	cmd := exec.Command("php", "../tests/client.php", "echo", "pipes")
 
 	w, err := workerImpl.InitBaseWorker(cmd)
 	assert.NoError(t, err)
 
 	stack.Push(w)
-	assert.Equal(t, int64(1), stack.actualNumOfWorkers)
+	assert.Equal(t, uint64(1), stack.actualNumOfWorkers)
 
 	assert.Equal(t, false, stack.IsEmpty())
 }
 
 func TestStack_Workers(t *testing.T) {
-	stack := NewWorkersStack()
+	stack := NewWorkersStack(1)
 	cmd := exec.Command("php", "../tests/client.php", "echo", "pipes")
 	w, err := workerImpl.InitBaseWorker(cmd)
 	assert.NoError(t, err)
@@ -82,20 +83,20 @@ func TestStack_Workers(t *testing.T) {
 }
 
 func TestStack_Reset(t *testing.T) {
-	stack := NewWorkersStack()
+	stack := NewWorkersStack(1)
 	cmd := exec.Command("php", "../tests/client.php", "echo", "pipes")
 	w, err := workerImpl.InitBaseWorker(cmd)
 	assert.NoError(t, err)
 	assert.NoError(t, w.Start())
 
 	stack.Push(w)
-	assert.Equal(t, int64(1), stack.actualNumOfWorkers)
+	assert.Equal(t, uint64(1), stack.actualNumOfWorkers)
 	stack.Reset()
-	assert.Equal(t, int64(0), stack.actualNumOfWorkers)
+	assert.Equal(t, uint64(0), stack.actualNumOfWorkers)
 }
 
 func TestStack_Destroy(t *testing.T) {
-	stack := NewWorkersStack()
+	stack := NewWorkersStack(1)
 	cmd := exec.Command("php", "../tests/client.php", "echo", "pipes")
 	w, err := workerImpl.InitBaseWorker(cmd)
 	assert.NoError(t, err)
@@ -103,5 +104,26 @@ func TestStack_Destroy(t *testing.T) {
 
 	stack.Push(w)
 	stack.Destroy(context.Background())
-	assert.Equal(t, int64(0), stack.actualNumOfWorkers)
+	assert.Equal(t, uint64(0), stack.actualNumOfWorkers)
+}
+
+func TestStack_DestroyWithWait(t *testing.T) {
+	stack := NewWorkersStack(2)
+	cmd := exec.Command("php", "../tests/client.php", "echo", "pipes")
+	w, err := workerImpl.InitBaseWorker(cmd)
+	assert.NoError(t, err)
+	assert.NoError(t, w.Start())
+
+	stack.Push(w)
+	stack.Push(w)
+	assert.Equal(t, uint64(2), stack.actualNumOfWorkers)
+
+	go func() {
+		wrk, _ := stack.Pop()
+		time.Sleep(time.Second * 3)
+		stack.Push(wrk)
+	}()
+	time.Sleep(time.Second)
+	stack.Destroy(context.Background())
+	assert.Equal(t, uint64(0), stack.actualNumOfWorkers)
 }
diff --git a/pkg/worker_watcher/worker_watcher.go b/pkg/worker_watcher/worker_watcher.go
index 0c086d5f..bf1f2435 100755
--- a/pkg/worker_watcher/worker_watcher.go
+++ b/pkg/worker_watcher/worker_watcher.go
@@ -13,23 +13,19 @@ import (
 // workerCreateFunc can be nil, but in that case, dead stack will not be replaced
 func NewWorkerWatcher(allocator worker.Allocator, numWorkers int64, events events.Handler) worker.Watcher {
 	ww := &workerWatcher{
-		stack:             NewWorkersStack(),
-		allocator:         allocator,
-		initialNumWorkers: numWorkers,
-		actualNumWorkers:  numWorkers,
-		events:            events,
+		stack:     NewWorkersStack(uint64(numWorkers)),
+		allocator: allocator,
+		events:    events,
 	}
 
 	return ww
 }
 
 type workerWatcher struct {
-	mutex             sync.RWMutex
-	stack             *Stack
-	allocator         worker.Allocator
-	initialNumWorkers int64
-	actualNumWorkers  int64
-	events            events.Handler
+	mutex     sync.RWMutex
+	stack     *Stack
+	allocator worker.Allocator
+	events    events.Handler
 }
 
 func (ww *workerWatcher) AddToWatch(workers []worker.BaseProcess) error {
diff --git a/plugins/server/config.go b/plugins/server/config.go
index 93b19226..92e6780a 100644
--- a/plugins/server/config.go
+++ b/plugins/server/config.go
@@ -23,7 +23,7 @@ type Config struct {
 		Relay string `mapstructure:"relay"`
 		// RelayTimeout defines for how long socket factory will be waiting for worker connection. This config section
 		// must not change on re-configuration. Defaults to 60s.
-		RelayTimeout time.Duration `mapstructure:"relayTimeout"`
+		RelayTimeout time.Duration `mapstructure:"relay_timeout"`
 	} `mapstructure:"server"`
 
 	RPC *struct {
diff --git a/tests/plugins/checker/configs/.rr-checker-init.yaml b/tests/plugins/checker/configs/.rr-checker-init.yaml
index 1273529a..36130382 100755
--- a/tests/plugins/checker/configs/.rr-checker-init.yaml
+++ b/tests/plugins/checker/configs/.rr-checker-init.yaml
@@ -9,7 +9,7 @@ server:
   env:
     "RR_HTTP": "true"
   relay: "pipes"
-  relayTimeout: "20s"
+  relay_timeout: "20s"
 
 status:
   address: "127.0.0.1:34333"
@@ -19,13 +19,13 @@ logs:
 http:
   debug: true
   address: 127.0.0.1:11933
-  maxRequestSize: 1024
+  max_request_size: 1024
   middleware: [ "" ]
   uploads:
     forbid: [ ".php", ".exe", ".bat" ]
-  trustedSubnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
+  trusted_subnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
   pool:
-    numWorkers: 2
-    maxJobs: 0
-    allocateTimeout: 60s
-    destroyTimeout: 60s
\ No newline at end of file
+    num_workers: 2
+    max_jobs: 0
+    allocate_timeout: 60s
+    destroy_timeout: 60s
\ No newline at end of file
diff --git a/tests/plugins/gzip/configs/.rr-http-middlewareNotExist.yaml b/tests/plugins/gzip/configs/.rr-http-middlewareNotExist.yaml
index a2d12706..b900ff30 100644
--- a/tests/plugins/gzip/configs/.rr-http-middlewareNotExist.yaml
+++ b/tests/plugins/gzip/configs/.rr-http-middlewareNotExist.yaml
@@ -5,21 +5,21 @@ server:
   env:
     "RR_HTTP": "true"
   relay: "pipes"
-  relayTimeout: "20s"
+  relay_timeout: "20s"
 
 http:
   debug: true
   address: 127.0.0.1:18103
-  maxRequestSize: 1024
+  max_request_size: 1024
   middleware: [ "gzip", "foo" ]
   uploads:
     forbid: [ ".php", ".exe", ".bat" ]
-  trustedSubnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
+  trusted_subnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
   pool:
-    numWorkers: 2
-    maxJobs: 0
-    allocateTimeout: 60s
-    destroyTimeout: 60s
+    num_workers: 2
+    max_jobs: 0
+    allocate_timeout: 60s
+    destroy_timeout: 60s
 logs:
   mode: development
   level: error
\ No newline at end of file
diff --git a/tests/plugins/gzip/configs/.rr-http-withGzip.yaml b/tests/plugins/gzip/configs/.rr-http-withGzip.yaml
index aff3efdb..3ab918fb 100644
--- a/tests/plugins/gzip/configs/.rr-http-withGzip.yaml
+++ b/tests/plugins/gzip/configs/.rr-http-withGzip.yaml
@@ -5,21 +5,21 @@ server:
   env:
     "RR_HTTP": "true"
   relay: "pipes"
-  relayTimeout: "20s"
+  relay_timeout: "20s"
 
 http:
   debug: true
   address: 127.0.0.1:18953
-  maxRequestSize: 1024
+  max_request_size: 1024
   middleware: [ "gzip" ]
   uploads:
     forbid: [ ".php", ".exe", ".bat" ]
-  trustedSubnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
+  trusted_subnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
   pool:
-    numWorkers: 2
-    maxJobs: 0
-    allocateTimeout: 60s
-    destroyTimeout: 60s
+    num_workers: 2
+    max_jobs: 0
+    allocate_timeout: 60s
+    destroy_timeout: 60s
 logs:
   mode: development
   level: error
\ No newline at end of file
diff --git a/tests/plugins/headers/configs/.rr-cors-headers.yaml b/tests/plugins/headers/configs/.rr-cors-headers.yaml
index 9d4e8b36..2e16ee66 100644
--- a/tests/plugins/headers/configs/.rr-cors-headers.yaml
+++ b/tests/plugins/headers/configs/.rr-cors-headers.yaml
@@ -5,16 +5,16 @@ server:
   env:
     "RR_HTTP": "true"
   relay: "pipes"
-  relayTimeout: "20s"
+  relay_timeout: "20s"
 
 http:
   debug: true
   address: 127.0.0.1:22855
-  maxRequestSize: 1024
+  max_request_size: 1024
   middleware: [ "headers" ]
   uploads:
     forbid: [ ".php", ".exe", ".bat" ]
-  trustedSubnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
+  trusted_subnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
   # Additional HTTP headers and CORS control.
   headers:
     cors:
@@ -29,10 +29,10 @@ http:
     response:
       "output": "output-header"
   pool:
-    numWorkers: 2
-    maxJobs: 0
-    allocateTimeout: 60s
-    destroyTimeout: 60s
+    num_workers: 2
+    max_jobs: 0
+    allocate_timeout: 60s
+    destroy_timeout: 60s
 logs:
   mode: development
   level: error
diff --git a/tests/plugins/headers/configs/.rr-headers-init.yaml b/tests/plugins/headers/configs/.rr-headers-init.yaml
index 8d63a187..55b5b5a8 100644
--- a/tests/plugins/headers/configs/.rr-headers-init.yaml
+++ b/tests/plugins/headers/configs/.rr-headers-init.yaml
@@ -5,16 +5,16 @@ server:
   env:
     "RR_HTTP": "true"
   relay: "pipes"
-  relayTimeout: "20s"
+  relay_timeout: "20s"
 
 http:
   debug: true
   address: 127.0.0.1:33453
-  maxRequestSize: 1024
+  max_request_size: 1024
   middleware: [ "headers" ]
   uploads:
     forbid: [ ".php", ".exe", ".bat" ]
-  trustedSubnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
+  trusted_subnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
   # Additional HTTP headers and CORS control.
   headers:
     cors:
@@ -29,10 +29,10 @@ http:
     response:
       "X-Powered-By": "RoadRunner"
   pool:
-    numWorkers: 2
-    maxJobs: 0
-    allocateTimeout: 60s
-    destroyTimeout: 60s
+    num_workers: 2
+    max_jobs: 0
+    allocate_timeout: 60s
+    destroy_timeout: 60s
 logs:
   mode: development
   level: error
diff --git a/tests/plugins/headers/configs/.rr-req-headers.yaml b/tests/plugins/headers/configs/.rr-req-headers.yaml
index f8ab9bec..fc38a74b 100644
--- a/tests/plugins/headers/configs/.rr-req-headers.yaml
+++ b/tests/plugins/headers/configs/.rr-req-headers.yaml
@@ -5,16 +5,16 @@ server:
   env:
     "RR_HTTP": "true"
   relay: "pipes"
-  relayTimeout: "20s"
+  relay_timeout: "20s"
 
 http:
   debug: true
   address: 127.0.0.1:22655
-  maxRequestSize: 1024
+  max_request_size: 1024
   middleware: [ "headers" ]
   uploads:
     forbid: [ ".php", ".exe", ".bat" ]
-  trustedSubnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
+  trusted_subnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
   # Additional HTTP headers and CORS control.
   headers:
     request:
@@ -22,10 +22,10 @@ http:
     response:
       "output": "output-header"
   pool:
-    numWorkers: 2
-    maxJobs: 0
-    allocateTimeout: 60s
-    destroyTimeout: 60s
+    num_workers: 2
+    max_jobs: 0
+    allocate_timeout: 60s
+    destroy_timeout: 60s
 logs:
   mode: development
   level: error
diff --git a/tests/plugins/headers/configs/.rr-res-headers.yaml b/tests/plugins/headers/configs/.rr-res-headers.yaml
index 36ab4eb3..be9cfead 100644
--- a/tests/plugins/headers/configs/.rr-res-headers.yaml
+++ b/tests/plugins/headers/configs/.rr-res-headers.yaml
@@ -5,16 +5,16 @@ server:
   env:
     "RR_HTTP": "true"
   relay: "pipes"
-  relayTimeout: "20s"
+  relay_timeout: "20s"
 
 http:
   debug: true
   address: 127.0.0.1:22455
-  maxRequestSize: 1024
+  max_request_size: 1024
   middleware: [ "headers" ]
   uploads:
     forbid: [ ".php", ".exe", ".bat" ]
-  trustedSubnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
+  trusted_subnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
   # Additional HTTP headers and CORS control.
   headers:
     request:
@@ -22,10 +22,10 @@ http:
     response:
       "output": "output-header"
   pool:
-    numWorkers: 2
-    maxJobs: 0
-    allocateTimeout: 60s
-    destroyTimeout: 60s
+    num_workers: 2
+    max_jobs: 0
+    allocate_timeout: 60s
+    destroy_timeout: 60s
 logs:
   mode: development
   level: error
diff --git a/tests/plugins/http/configs/.rr-broken-pipes.yaml b/tests/plugins/http/configs/.rr-broken-pipes.yaml
index 8006cb5f..bfcbf592 100644
--- a/tests/plugins/http/configs/.rr-broken-pipes.yaml
+++ b/tests/plugins/http/configs/.rr-broken-pipes.yaml
@@ -9,21 +9,21 @@ server:
   env:
     "RR_HTTP": "true"
   relay: "pipes"
-  relayTimeout: "20s"
+  relay_timeout: "20s"
 
 http:
   debug: true
   address: 127.0.0.1:12384
-  maxRequestSize: 1024
+  max_request_size: 1024
   middleware: [ "" ]
   uploads:
     forbid: [ ".php", ".exe", ".bat" ]
-  trustedSubnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
+  trusted_subnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
   pool:
-    numWorkers: 2
-    maxJobs: 0
-    allocateTimeout: 60s
-    destroyTimeout: 60s
+    num_workers: 2
+    max_jobs: 0
+    allocate_timeout: 60s
+    destroy_timeout: 60s
 logs:
   mode: development
   level: error
diff --git a/tests/plugins/http/configs/.rr-env.yaml b/tests/plugins/http/configs/.rr-env.yaml
index 1cce5dab..219bad19 100644
--- a/tests/plugins/http/configs/.rr-env.yaml
+++ b/tests/plugins/http/configs/.rr-env.yaml
@@ -9,24 +9,24 @@ server:
   env:
     "env_key": "ENV_VALUE"
   relay: "pipes"
-  relayTimeout: "20s"
+  relay_timeout: "20s"
 
 http:
   debug: true
   address: 127.0.0.1:12084
-  maxRequestSize: 1024
+  max_request_size: 1024
   middleware: [ "" ]
   env:
     "RR_HTTP": "true"
     "env_key": "ENV_VALUE"
   uploads:
     forbid: [ ".php", ".exe", ".bat" ]
-  trustedSubnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
+  trusted_subnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
   pool:
-    numWorkers: 2
-    maxJobs: 0
-    allocateTimeout: 60s
-    destroyTimeout: 60s
+    num_workers: 2
+    max_jobs: 0
+    allocate_timeout: 60s
+    destroy_timeout: 60s
 logs:
   mode: development
   level: error
diff --git a/tests/plugins/http/configs/.rr-fcgi-reqUri.yaml b/tests/plugins/http/configs/.rr-fcgi-reqUri.yaml
index 725ae724..99002777 100644
--- a/tests/plugins/http/configs/.rr-fcgi-reqUri.yaml
+++ b/tests/plugins/http/configs/.rr-fcgi-reqUri.yaml
@@ -5,21 +5,21 @@ server:
   env:
     "RR_HTTP": "true"
   relay: "pipes"
-  relayTimeout: "20s"
+  relay_timeout: "20s"
 
 http:
   debug: true
   address: :8082
-  maxRequestSize: 1024
+  max_request_size: 1024
   middleware: [ "" ]
   uploads:
     forbid: [ ".php", ".exe", ".bat" ]
-  trustedSubnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
+  trusted_subnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
   pool:
-    numWorkers: 1
-    maxJobs: 0
-    allocateTimeout: 60s
-    destroyTimeout: 60s
+    num_workers: 1
+    max_jobs: 0
+    allocate_timeout: 60s
+    destroy_timeout: 60s
 
   ssl:
     port: 8890
diff --git a/tests/plugins/http/configs/.rr-fcgi.yaml b/tests/plugins/http/configs/.rr-fcgi.yaml
index ba119a88..110b68f4 100644
--- a/tests/plugins/http/configs/.rr-fcgi.yaml
+++ b/tests/plugins/http/configs/.rr-fcgi.yaml
@@ -5,21 +5,21 @@ server:
   env:
     "RR_HTTP": "true"
   relay: "pipes"
-  relayTimeout: "20s"
+  relay_timeout: "20s"
 
 http:
   debug: true
   address: :8081
-  maxRequestSize: 1024
+  max_request_size: 1024
   middleware: [ "" ]
   uploads:
     forbid: [ ".php", ".exe", ".bat" ]
-  trustedSubnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
+  trusted_subnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
   pool:
-    numWorkers: 1
-    maxJobs: 0
-    allocateTimeout: 60s
-    destroyTimeout: 60s
+    num_workers: 1
+    max_jobs: 0
+    allocate_timeout: 60s
+    destroy_timeout: 60s
 
   ssl:
     port: 8889
diff --git a/tests/plugins/http/configs/.rr-h2c.yaml b/tests/plugins/http/configs/.rr-h2c.yaml
index 287b7929..c2703182 100644
--- a/tests/plugins/http/configs/.rr-h2c.yaml
+++ b/tests/plugins/http/configs/.rr-h2c.yaml
@@ -5,21 +5,21 @@ server:
   env:
     "RR_HTTP": "true"
   relay: "pipes"
-  relayTimeout: "20s"
+  relay_timeout: "20s"
 
 http:
   debug: true
   address: :8083
-  maxRequestSize: 1024
+  max_request_size: 1024
   middleware: [ "" ]
   uploads:
     forbid: [ ".php", ".exe", ".bat" ]
-  trustedSubnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
+  trusted_subnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
   pool:
-    numWorkers: 1
-    maxJobs: 0
-    allocateTimeout: 60s
-    destroyTimeout: 60s
+    num_workers: 1
+    max_jobs: 0
+    allocate_timeout: 60s
+    destroy_timeout: 60s
   http2:
     enabled: true
     h2c: true
diff --git a/tests/plugins/http/configs/.rr-http.yaml b/tests/plugins/http/configs/.rr-http.yaml
index 93f131f8..30d31819 100644
--- a/tests/plugins/http/configs/.rr-http.yaml
+++ b/tests/plugins/http/configs/.rr-http.yaml
@@ -9,21 +9,21 @@ server:
   env:
     "RR_HTTP": "true"
   relay: "pipes"
-  relayTimeout: "20s"
+  relay_timeout: "20s"
 
 http:
   debug: true
   address: 127.0.0.1:18903
-  maxRequestSize: 1024
+  max_request_size: 1024
   middleware: [ "pluginMiddleware", "pluginMiddleware2" ]
   uploads:
     forbid: [ ".php", ".exe", ".bat" ]
-  trustedSubnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
+  trusted_subnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
   pool:
-    numWorkers: 2
-    maxJobs: 0
-    allocateTimeout: 60s
-    destroyTimeout: 60s
+    num_workers: 2
+    max_jobs: 0
+    allocate_timeout: 60s
+    destroy_timeout: 60s
 logs:
   mode: development
   level: error
diff --git a/tests/plugins/http/configs/.rr-init.yaml b/tests/plugins/http/configs/.rr-init.yaml
index 79303eab..b541e6de 100644
--- a/tests/plugins/http/configs/.rr-init.yaml
+++ b/tests/plugins/http/configs/.rr-init.yaml
@@ -9,21 +9,21 @@ server:
   env:
     "RR_HTTP": "true"
   relay: "pipes"
-  relayTimeout: "20s"
+  relay_timeout: "20s"
 
 http:
   debug: true
   address: 127.0.0.1:15395
-  maxRequestSize: 1024
+  max_request_size: 1024
   middleware: [ "" ]
   uploads:
     forbid: [ ".php", ".exe", ".bat" ]
-  trustedSubnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
+  trusted_subnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
   pool:
-    numWorkers: 2
-    maxJobs: 0
-    allocateTimeout: 60s
-    destroyTimeout: 60s
+    num_workers: 2
+    max_jobs: 0
+    allocate_timeout: 60s
+    destroy_timeout: 60s
 
   ssl:
     port: 8892
diff --git a/tests/plugins/http/configs/.rr-resetter.yaml b/tests/plugins/http/configs/.rr-resetter.yaml
index e2edafc6..88c54858 100644
--- a/tests/plugins/http/configs/.rr-resetter.yaml
+++ b/tests/plugins/http/configs/.rr-resetter.yaml
@@ -9,21 +9,21 @@ server:
   env:
     "RR_HTTP": "true"
   relay: "pipes"
-  relayTimeout: "20s"
+  relay_timeout: "20s"
 
 http:
   debug: true
   address: 127.0.0.1:10084
-  maxRequestSize: 1024
+  max_request_size: 1024
   middleware: [ "" ]
   uploads:
     forbid: [ ".php", ".exe", ".bat" ]
-  trustedSubnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
+  trusted_subnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
   pool:
-    numWorkers: 2
-    maxJobs: 0
-    allocateTimeout: 60s
-    destroyTimeout: 60s
+    num_workers: 2
+    max_jobs: 0
+    allocate_timeout: 60s
+    destroy_timeout: 60s
 logs:
   mode: development
   level: error
diff --git a/tests/plugins/http/configs/.rr-ssl-push.yaml b/tests/plugins/http/configs/.rr-ssl-push.yaml
index 81699a21..ae9fbc02 100644
--- a/tests/plugins/http/configs/.rr-ssl-push.yaml
+++ b/tests/plugins/http/configs/.rr-ssl-push.yaml
@@ -5,21 +5,21 @@ server:
   env:
     "RR_HTTP": "true"
   relay: "pipes"
-  relayTimeout: "20s"
+  relay_timeout: "20s"
 
 http:
   debug: true
   address: :8086
-  maxRequestSize: 1024
+  max_request_size: 1024
   middleware: [ "" ]
   uploads:
     forbid: [ ".php", ".exe", ".bat" ]
-  trustedSubnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
+  trusted_subnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
   pool:
-    numWorkers: 1
-    maxJobs: 0
-    allocateTimeout: 60s
-    destroyTimeout: 60s
+    num_workers: 1
+    max_jobs: 0
+    allocate_timeout: 60s
+    destroy_timeout: 60s
 
   ssl:
     port: 8894
diff --git a/tests/plugins/http/configs/.rr-ssl-redirect.yaml b/tests/plugins/http/configs/.rr-ssl-redirect.yaml
index fe6c5a86..d052e649 100644
--- a/tests/plugins/http/configs/.rr-ssl-redirect.yaml
+++ b/tests/plugins/http/configs/.rr-ssl-redirect.yaml
@@ -5,21 +5,21 @@ server:
   env:
     "RR_HTTP": "true"
   relay: "pipes"
-  relayTimeout: "20s"
+  relay_timeout: "20s"
 
 http:
   debug: true
   address: :8087
-  maxRequestSize: 1024
+  max_request_size: 1024
   middleware: [ "" ]
   uploads:
     forbid: [ ".php", ".exe", ".bat" ]
-  trustedSubnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
+  trusted_subnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
   pool:
-    numWorkers: 1
-    maxJobs: 0
-    allocateTimeout: 60s
-    destroyTimeout: 60s
+    num_workers: 1
+    max_jobs: 0
+    allocate_timeout: 60s
+    destroy_timeout: 60s
 
   ssl:
     port: 8895
diff --git a/tests/plugins/http/configs/.rr-ssl.yaml b/tests/plugins/http/configs/.rr-ssl.yaml
index 3255383a..182ac7ef 100644
--- a/tests/plugins/http/configs/.rr-ssl.yaml
+++ b/tests/plugins/http/configs/.rr-ssl.yaml
@@ -5,21 +5,21 @@ server:
   env:
     "RR_HTTP": "true"
   relay: "pipes"
-  relayTimeout: "20s"
+  relay_timeout: "20s"
 
 http:
   debug: true
   address: :8085
-  maxRequestSize: 1024
+  max_request_size: 1024
   middleware: [ "" ]
   uploads:
     forbid: [ ".php", ".exe", ".bat" ]
-  trustedSubnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
+  trusted_subnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
   pool:
-    numWorkers: 1
-    maxJobs: 0
-    allocateTimeout: 60s
-    destroyTimeout: 60s
+    num_workers: 1
+    max_jobs: 0
+    allocate_timeout: 60s
+    destroy_timeout: 60s
 
   ssl:
     port: 8893
diff --git a/tests/plugins/informer/.rr-informer.yaml b/tests/plugins/informer/.rr-informer.yaml
index e50ca9c9..e5853b21 100644
--- a/tests/plugins/informer/.rr-informer.yaml
+++ b/tests/plugins/informer/.rr-informer.yaml
@@ -6,7 +6,7 @@ server:
     "RR_CONFIG": "/some/place/on/the/C134"
     "RR_CONFIG2": "C138"
   relay: "pipes"
-  relayTimeout: "20s"
+  relay_timeout: "20s"
 
 rpc:
   listen: tcp://127.0.0.1:6001
diff --git a/tests/plugins/kv/boltdb/configs/.rr-init.yaml b/tests/plugins/kv/boltdb/configs/.rr-init.yaml
index 4629a24b..8cfa20e9 100644
--- a/tests/plugins/kv/boltdb/configs/.rr-init.yaml
+++ b/tests/plugins/kv/boltdb/configs/.rr-init.yaml
@@ -9,7 +9,7 @@ server:
   env:
     "RR_HTTP": "true"
   relay: "pipes"
-  relayTimeout: "20s"
+  relay_timeout: "20s"
 
 logs:
   mode: development
@@ -17,11 +17,11 @@ logs:
 
 http:
   address: 127.0.0.1:44933
-  maxRequestSize: 1024
+  max_request_size: 1024
   middleware: ["gzip", "headers"]
   uploads:
     forbid: [".php", ".exe", ".bat"]
-  trustedSubnets:
+  trusted_subnets:
     [
       "10.0.0.0/8",
       "127.0.0.0/8",
@@ -32,10 +32,10 @@ http:
       "fe80::/10",
     ]
   pool:
-    numWorkers: 6
-    maxJobs: 0
-    allocateTimeout: 60s
-    destroyTimeout: 60s
+    num_workers: 6
+    max_jobs: 0
+    allocate_timeout: 60s
+    destroy_timeout: 60s
 
 # boltdb simple driver
 boltdb:
diff --git a/tests/plugins/kv/memcached/configs/.rr-init.yaml b/tests/plugins/kv/memcached/configs/.rr-init.yaml
index 759fc3ba..66ed75cf 100644
--- a/tests/plugins/kv/memcached/configs/.rr-init.yaml
+++ b/tests/plugins/kv/memcached/configs/.rr-init.yaml
@@ -9,7 +9,7 @@ server:
   env:
     "RR_HTTP": "true"
   relay: "pipes"
-  relayTimeout: "20s"
+  relay_timeout: "20s"
 
 logs:
   mode: development
@@ -17,11 +17,11 @@ logs:
 
 http:
   address: 127.0.0.1:44933
-  maxRequestSize: 1024
+  max_request_size: 1024
   middleware: ["gzip", "headers"]
   uploads:
     forbid: [".php", ".exe", ".bat"]
-  trustedSubnets:
+  trusted_subnets:
     [
       "10.0.0.0/8",
       "127.0.0.0/8",
@@ -32,10 +32,10 @@ http:
       "fe80::/10",
     ]
   pool:
-    numWorkers: 6
-    maxJobs: 0
-    allocateTimeout: 60s
-    destroyTimeout: 60s
+    num_workers: 6
+    max_jobs: 0
+    allocate_timeout: 60s
+    destroy_timeout: 60s
 
 # boltdb simple driver
 memcached:
diff --git a/tests/plugins/kv/memory/configs/.rr-init.yaml b/tests/plugins/kv/memory/configs/.rr-init.yaml
index dedc6cd2..e352fad2 100644
--- a/tests/plugins/kv/memory/configs/.rr-init.yaml
+++ b/tests/plugins/kv/memory/configs/.rr-init.yaml
@@ -9,7 +9,7 @@ server:
   env:
     "RR_HTTP": "true"
   relay: "pipes"
-  relayTimeout: "20s"
+  relay_timeout: "20s"
 
 logs:
   mode: development
@@ -17,11 +17,11 @@ logs:
 
 http:
   address: 127.0.0.1:44933
-  maxRequestSize: 1024
+  max_request_size: 1024
   middleware: ["gzip", "headers"]
   uploads:
     forbid: [".php", ".exe", ".bat"]
-  trustedSubnets:
+  trusted_subnets:
     [
       "10.0.0.0/8",
       "127.0.0.0/8",
@@ -32,10 +32,10 @@ http:
       "fe80::/10",
     ]
   pool:
-    numWorkers: 6
-    maxJobs: 0
-    allocateTimeout: 60s
-    destroyTimeout: 60s
+    num_workers: 6
+    max_jobs: 0
+    allocate_timeout: 60s
+    destroy_timeout: 60s
 
 # in memory KV driver
 memory:
diff --git a/tests/plugins/reload/configs/.rr-reload-2.yaml b/tests/plugins/reload/configs/.rr-reload-2.yaml
index ab32b2d1..882ab628 100644
--- a/tests/plugins/reload/configs/.rr-reload-2.yaml
+++ b/tests/plugins/reload/configs/.rr-reload-2.yaml
@@ -5,11 +5,11 @@ server:
   env:
     RR_HTTP: 'true'
   relay: pipes
-  relayTimeout: 20s
+  relay_timeout: 20s
 http:
   debug: true
   address: '127.0.0.1:27388'
-  maxRequestSize: 1024
+  max_request_size: 1024
   middleware:
     - ''
   uploads:
@@ -17,7 +17,7 @@ http:
       - .php
       - .exe
       - .bat
-  trustedSubnets:
+  trusted_subnets:
     - 10.0.0.0/8
     - 127.0.0.0/8
     - 172.16.0.0/12
@@ -26,10 +26,10 @@ http:
     - 'fc00::/7'
     - 'fe80::/10'
   pool:
-    numWorkers: 2
-    maxJobs: 0
-    allocateTimeout: 60s
-    destroyTimeout: 60s
+    num_workers: 2
+    max_jobs: 0
+    allocate_timeout: 60s
+    destroy_timeout: 60s
 logs:
   mode: development
   level: error
diff --git a/tests/plugins/reload/configs/.rr-reload-3.yaml b/tests/plugins/reload/configs/.rr-reload-3.yaml
index 881d9b88..4f964609 100644
--- a/tests/plugins/reload/configs/.rr-reload-3.yaml
+++ b/tests/plugins/reload/configs/.rr-reload-3.yaml
@@ -5,11 +5,11 @@ server:
   env:
     RR_HTTP: 'true'
   relay: pipes
-  relayTimeout: 20s
+  relay_timeout: 20s
 http:
   debug: true
   address: '127.0.0.1:37388'
-  maxRequestSize: 1024
+  max_request_size: 1024
   middleware:
     - ''
   uploads:
@@ -17,7 +17,7 @@ http:
       - .php
       - .exe
       - .bat
-  trustedSubnets:
+  trusted_subnets:
     - 10.0.0.0/8
     - 127.0.0.0/8
     - 172.16.0.0/12
@@ -26,10 +26,10 @@ http:
     - 'fc00::/7'
     - 'fe80::/10'
   pool:
-    numWorkers: 2
-    maxJobs: 0
-    allocateTimeout: 60s
-    destroyTimeout: 60s
+    num_workers: 2
+    max_jobs: 0
+    allocate_timeout: 60s
+    destroy_timeout: 60s
 logs:
   mode: development
   level: error
diff --git a/tests/plugins/reload/configs/.rr-reload-4.yaml b/tests/plugins/reload/configs/.rr-reload-4.yaml
index d47df558..76966e49 100644
--- a/tests/plugins/reload/configs/.rr-reload-4.yaml
+++ b/tests/plugins/reload/configs/.rr-reload-4.yaml
@@ -5,11 +5,11 @@ server:
   env:
     RR_HTTP: 'true'
   relay: pipes
-  relayTimeout: 20s
+  relay_timeout: 20s
 http:
   debug: true
   address: '127.0.0.1:22766'
-  maxRequestSize: 1024
+  max_request_size: 1024
   middleware:
     - ''
   uploads:
@@ -17,7 +17,7 @@ http:
       - .php
       - .exe
       - .bat
-  trustedSubnets:
+  trusted_subnets:
     - 10.0.0.0/8
     - 127.0.0.0/8
     - 172.16.0.0/12
@@ -26,10 +26,10 @@ http:
     - 'fc00::/7'
     - 'fe80::/10'
   pool:
-    numWorkers: 2
-    maxJobs: 0
-    allocateTimeout: 60s
-    destroyTimeout: 60s
+    num_workers: 2
+    max_jobs: 0
+    allocate_timeout: 60s
+    destroy_timeout: 60s
 logs:
   mode: development
   level: error
diff --git a/tests/plugins/reload/configs/.rr-reload.yaml b/tests/plugins/reload/configs/.rr-reload.yaml
index 794c41f2..5dfb1171 100644
--- a/tests/plugins/reload/configs/.rr-reload.yaml
+++ b/tests/plugins/reload/configs/.rr-reload.yaml
@@ -5,11 +5,11 @@ server:
   env:
     RR_HTTP: 'true'
   relay: pipes
-  relayTimeout: 20s
+  relay_timeout: 20s
 http:
   debug: true
   address: '127.0.0.1:22388'
-  maxRequestSize: 1024
+  max_request_size: 1024
   middleware:
     - ''
   uploads:
@@ -17,7 +17,7 @@ http:
       - .php
       - .exe
       - .bat
-  trustedSubnets:
+  trusted_subnets:
     - 10.0.0.0/8
     - 127.0.0.0/8
     - 172.16.0.0/12
@@ -26,10 +26,10 @@ http:
     - 'fc00::/7'
     - 'fe80::/10'
   pool:
-    numWorkers: 2
-    maxJobs: 0
-    allocateTimeout: 60s
-    destroyTimeout: 60s
+    num_workers: 2
+    max_jobs: 0
+    allocate_timeout: 60s
+    destroy_timeout: 60s
 logs:
   mode: development
   level: error
diff --git a/tests/plugins/resetter/.rr-resetter.yaml b/tests/plugins/resetter/.rr-resetter.yaml
index e50ca9c9..e5853b21 100644
--- a/tests/plugins/resetter/.rr-resetter.yaml
+++ b/tests/plugins/resetter/.rr-resetter.yaml
@@ -6,7 +6,7 @@ server:
     "RR_CONFIG": "/some/place/on/the/C134"
     "RR_CONFIG2": "C138"
   relay: "pipes"
-  relayTimeout: "20s"
+  relay_timeout: "20s"
 
 rpc:
   listen: tcp://127.0.0.1:6001
diff --git a/tests/plugins/server/configs/.rr-no-app-section.yaml b/tests/plugins/server/configs/.rr-no-app-section.yaml
index 4888d249..e44eeb56 100644
--- a/tests/plugins/server/configs/.rr-no-app-section.yaml
+++ b/tests/plugins/server/configs/.rr-no-app-section.yaml
@@ -6,7 +6,7 @@ server:
     "RR_CONFIG": "/some/place/on/the/C134"
     "RR_CONFIG2": "C138"
   relay: "pipes"
-  relayTimeout: "20s"
+  relay_timeout: "20s"
 logs:
   mode: development
   level: error
\ No newline at end of file
diff --git a/tests/plugins/server/configs/.rr-sockets.yaml b/tests/plugins/server/configs/.rr-sockets.yaml
index 6b5b6bf5..0bc2d0f9 100644
--- a/tests/plugins/server/configs/.rr-sockets.yaml
+++ b/tests/plugins/server/configs/.rr-sockets.yaml
@@ -6,7 +6,7 @@ server:
     "RR_CONFIG": "/some/place/on/the/C134"
     "RR_CONFIG2": "C138"
   relay: "unix://unix.sock"
-  relayTimeout: "20s"
+  relay_timeout: "20s"
 logs:
   mode: development
   level: error
\ No newline at end of file
diff --git a/tests/plugins/server/configs/.rr-tcp.yaml b/tests/plugins/server/configs/.rr-tcp.yaml
index ee1d450a..f4580460 100644
--- a/tests/plugins/server/configs/.rr-tcp.yaml
+++ b/tests/plugins/server/configs/.rr-tcp.yaml
@@ -6,7 +6,7 @@ server:
     "RR_CONFIG": "/some/place/on/the/C134"
     "RR_CONFIG2": "C138"
   relay: "tcp://localhost:9999"
-  relayTimeout: "20s"
+  relay_timeout: "20s"
 logs:
   mode: development
   level: error
\ No newline at end of file
diff --git a/tests/plugins/server/configs/.rr-wrong-command.yaml b/tests/plugins/server/configs/.rr-wrong-command.yaml
index e66349dd..c97d8b7e 100644
--- a/tests/plugins/server/configs/.rr-wrong-command.yaml
+++ b/tests/plugins/server/configs/.rr-wrong-command.yaml
@@ -6,7 +6,7 @@ server:
     "RR_CONFIG": "/some/place/on/the/C134"
     "RR_CONFIG2": "C138"
   relay: "pipes"
-  relayTimeout: "20s"
+  relay_timeout: "20s"
 logs:
   mode: development
   level: error
\ No newline at end of file
diff --git a/tests/plugins/server/configs/.rr-wrong-relay.yaml b/tests/plugins/server/configs/.rr-wrong-relay.yaml
index 6f532c3f..9722a487 100644
--- a/tests/plugins/server/configs/.rr-wrong-relay.yaml
+++ b/tests/plugins/server/configs/.rr-wrong-relay.yaml
@@ -6,7 +6,7 @@ server:
     "RR_CONFIG": "/some/place/on/the/C134"
     "RR_CONFIG2": "C138"
   relay: "pupes"
-  relayTimeout: "20s"
+  relay_timeout: "20s"
 logs:
   mode: development
   level: error
\ No newline at end of file
diff --git a/tests/plugins/server/configs/.rr.yaml b/tests/plugins/server/configs/.rr.yaml
index 4888d249..e44eeb56 100644
--- a/tests/plugins/server/configs/.rr.yaml
+++ b/tests/plugins/server/configs/.rr.yaml
@@ -6,7 +6,7 @@ server:
     "RR_CONFIG": "/some/place/on/the/C134"
     "RR_CONFIG2": "C138"
   relay: "pipes"
-  relayTimeout: "20s"
+  relay_timeout: "20s"
 logs:
   mode: development
   level: error
\ No newline at end of file
diff --git a/tests/plugins/static/configs/.rr-http-static-disabled.yaml b/tests/plugins/static/configs/.rr-http-static-disabled.yaml
index d8ee15e0..e31baffc 100644
--- a/tests/plugins/static/configs/.rr-http-static-disabled.yaml
+++ b/tests/plugins/static/configs/.rr-http-static-disabled.yaml
@@ -5,14 +5,14 @@ server:
   env:
     "RR_HTTP": "true"
   relay: "pipes"
-  relayTimeout: "20s"
+  relay_timeout: "20s"
 
 http:
   debug: true
   address: 127.0.0.1:21234
-  maxRequestSize: 1024
+  max_request_size: 1024
   middleware: [ "gzip", "static" ]
-  trustedSubnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
+  trusted_subnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
   uploads:
     forbid: [ ".php", ".exe", ".bat" ]
   static:
@@ -24,10 +24,10 @@ http:
     response:
       "X-Powered-By": "RoadRunner"
   pool:
-    numWorkers: 2
-    maxJobs: 0
-    allocateTimeout: 60s
-    destroyTimeout: 60s
+    num_workers: 2
+    max_jobs: 0
+    allocate_timeout: 60s
+    destroy_timeout: 60s
 logs:
   mode: development
   level: error
\ No newline at end of file
diff --git a/tests/plugins/static/configs/.rr-http-static-files-disable.yaml b/tests/plugins/static/configs/.rr-http-static-files-disable.yaml
index 563d95cf..deb408db 100644
--- a/tests/plugins/static/configs/.rr-http-static-files-disable.yaml
+++ b/tests/plugins/static/configs/.rr-http-static-files-disable.yaml
@@ -5,14 +5,14 @@ server:
   env:
     "RR_HTTP": "true"
   relay: "pipes"
-  relayTimeout: "20s"
+  relay_timeout: "20s"
 
 http:
   debug: true
   address: 127.0.0.1:45877
-  maxRequestSize: 1024
+  max_request_size: 1024
   middleware: [ "gzip", "static" ]
-  trustedSubnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
+  trusted_subnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
   uploads:
     forbid: [ ".php", ".exe", ".bat" ]
   static:
@@ -24,10 +24,10 @@ http:
     response:
       "X-Powered-By": "RoadRunner"
   pool:
-    numWorkers: 2
-    maxJobs: 0
-    allocateTimeout: 60s
-    destroyTimeout: 60s
+    num_workers: 2
+    max_jobs: 0
+    allocate_timeout: 60s
+    destroy_timeout: 60s
 logs:
   mode: development
   level: error
\ No newline at end of file
diff --git a/tests/plugins/static/configs/.rr-http-static-files.yaml b/tests/plugins/static/configs/.rr-http-static-files.yaml
index 8961c6f4..deb1f253 100644
--- a/tests/plugins/static/configs/.rr-http-static-files.yaml
+++ b/tests/plugins/static/configs/.rr-http-static-files.yaml
@@ -5,14 +5,14 @@ server:
   env:
     "RR_HTTP": "true"
   relay: "pipes"
-  relayTimeout: "20s"
+  relay_timeout: "20s"
 
 http:
   debug: true
   address: 127.0.0.1:34653
-  maxRequestSize: 1024
+  max_request_size: 1024
   middleware: [ "gzip", "static" ]
-  trustedSubnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
+  trusted_subnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
   uploads:
     forbid: [ ".php", ".exe", ".bat" ]
   static:
@@ -25,10 +25,10 @@ http:
     response:
       "X-Powered-By": "RoadRunner"
   pool:
-    numWorkers: 2
-    maxJobs: 0
-    allocateTimeout: 60s
-    destroyTimeout: 60s
+    num_workers: 2
+    max_jobs: 0
+    allocate_timeout: 60s
+    destroy_timeout: 60s
 logs:
   mode: development
   level: error
\ No newline at end of file
diff --git a/tests/plugins/static/configs/.rr-http-static.yaml b/tests/plugins/static/configs/.rr-http-static.yaml
index 0a1f5df4..e5af9043 100644
--- a/tests/plugins/static/configs/.rr-http-static.yaml
+++ b/tests/plugins/static/configs/.rr-http-static.yaml
@@ -5,13 +5,13 @@ server:
   env:
     "RR_HTTP": "true"
   relay: "pipes"
-  relayTimeout: "20s"
+  relay_timeout: "20s"
 
 http:
   address: 127.0.0.1:21603
-  maxRequestSize: 1024
+  max_request_size: 1024
   middleware: [ "gzip", "static" ]
-  trustedSubnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
+  trusted_subnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ]
   uploads:
     forbid: [ ".php", ".exe", ".bat" ]
   static:
@@ -22,10 +22,10 @@ http:
     response:
       "output": "output-header"
   pool:
-    numWorkers: 2
-    maxJobs: 0
-    allocateTimeout: 60s
-    destroyTimeout: 60s
+    num_workers: 2
+    max_jobs: 0
+    allocate_timeout: 60s
+    destroy_timeout: 60s
 logs:
   mode: development
   level: error
\ No newline at end of file