diff --git a/_examples/service/beast.toml b/_examples/service/beast.toml
index 18615782..e95a4a2d 100644
--- a/_examples/service/beast.toml
+++ b/_examples/service/beast.toml
@@ -8,7 +8,7 @@ name = "service"
 flag = "CTF{sample_flag}"
 type = "service"
 points = 100
-max_attempt_limit=10
+maxAttemptLimit = 10
 
 [[challenge.metadata.hints]]
 text = "simple_hint_1"
diff --git a/_examples/web-php-mysql/beast.toml b/_examples/web-php-mysql/beast.toml
index adef61ef..f09b6e0e 100644
--- a/_examples/web-php-mysql/beast.toml
+++ b/_examples/web-php-mysql/beast.toml
@@ -8,7 +8,7 @@ name = "web-php-mysql"
 flag = "CTF{sample_flag}"
 type = "web:php:7.1:cli"
 points = 200
-max_attempt_limit=10
+maxAttemptLimit = 10
 
 [[challenge.metadata.hints]]
 text = "simple_hint_1"
@@ -19,7 +19,6 @@ text = "simple_hint_2"
 points = 20
 
 
-
 [challenge.env]
 apt_deps = ["gcc", "php*-mysql"]
 setup_scripts = ["setup.sh"]
diff --git a/_examples/web-php/beast.toml b/_examples/web-php/beast.toml
index b82a5d11..3caf7425 100644
--- a/_examples/web-php/beast.toml
+++ b/_examples/web-php/beast.toml
@@ -7,7 +7,7 @@ ssh_key = "ssh-rsa AAAAB3NzaC1y"
 name = "web-php"
 flag = "BACKDOOR{SAMPLE_WEB_FLAG}"
 type = "web:php:7.1:cli"
-max_attempt_limit = 3
+maxAttemptLimit = 3
 points = 200
 
 [[challenge.metadata.hints]]
diff --git a/_examples/xinetd-service/beast.toml b/_examples/xinetd-service/beast.toml
index f0f113ca..f4c7bbf7 100644
--- a/_examples/xinetd-service/beast.toml
+++ b/_examples/xinetd-service/beast.toml
@@ -8,7 +8,7 @@ name = "xinetd-service"
 flag = "CTF{not_the_flag}"
 type = "service"
 points = 500
-max_attempt_limit=10
+maxAttemptLimit = 10
 
 [[challenge.metadata.hints]]
 text = "simple_hint_1"
@@ -21,7 +21,6 @@ points = 20
 preReqs = ["simple", "web-php"]
 
 
-
 [challenge.env]
 apt_deps = ["gcc", "socat"]
 setup_scripts = ["setup.sh"]
diff --git a/api/response.go b/api/response.go
index d109495c..92c8dd4f 100644
--- a/api/response.go
+++ b/api/response.go
@@ -125,7 +125,7 @@ type ChallengeInfoResp struct {
 	Points          uint            `json:"points" example:"50"`
 	SolvesNumber    int             `json:"solvesNumber" example:"100"`
 	Solves          []UserSolveResp `json:"solves"`
-	PreviousTries   int             `json:"previous_tries" example:"3"`
+	PreviousTries   int             `json:"previousTries" example:"3"`
 	DynamicFlag     bool            `json:"dynamicFlag" example:"true"`
 	Flag            string          `json:"flag"`
 	DeployedLink    string          `json:"deployedLink" example:"beast.sdslabs.co"`
diff --git a/core/config/challenge.go b/core/config/challenge.go
index 1fcfe113..545df0af 100644
--- a/core/config/challenge.go
+++ b/core/config/challenge.go
@@ -140,7 +140,7 @@ type ChallengeMetadata struct {
 		Text   string `toml:"text"`
 		Points uint   `toml:"points"`
 	} `toml:"hints"`
-	MaxAttemptLimit int      `toml:"max_attempt_limit"`
+	MaxAttemptLimit int      `toml:"maxAttemptLimit"`
 	PreReqs         []string `toml:"preReqs"`
 	DynamicFlag     bool     `toml:"dynamic_flag"`
 	Points          uint     `toml:"points"`