diff --git a/quartz-manager-frontend/src/app/services/user.service.ts b/quartz-manager-frontend/src/app/services/user.service.ts
index 3f2cc21..1f2d376 100644
--- a/quartz-manager-frontend/src/app/services/user.service.ts
+++ b/quartz-manager-frontend/src/app/services/user.service.ts
@@ -21,7 +21,7 @@ export class UserService {
 
   refreshToken() {
     this.apiService.get(this.config.refresh_token_url).subscribe(res => {
-        if (res.access_token !== null) {
+        if (res.accessToken !== null) {
           return this.getUserInfo().toPromise()
             .then(user => {
               this.currentUser = user;
diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/models/UserTokenState.java b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/models/UserTokenState.java
index b2f74b7..cb5a616 100644
--- a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/models/UserTokenState.java
+++ b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/models/UserTokenState.java
@@ -1,32 +1,19 @@
 package it.fabioformosa.quartzmanager.api.security.models;
 
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class UserTokenState {
-	private String access_token;
-	private Long expires_in_sec;
+	private String accessToken;
+	private Long expiresInSec;
 
-	public UserTokenState() {
-		this.access_token = null;
-		this.expires_in_sec = null;
+	public UserTokenState(String accessToken, long expiresInSec) {
+		this.accessToken = accessToken;
+		this.expiresInSec = expiresInSec;
 	}
 
-	public UserTokenState(String access_token, long expires_in_sec) {
-		this.access_token = access_token;
-		this.expires_in_sec = expires_in_sec;
-	}
-
-	public String getAccess_token() {
-		return access_token;
-	}
-
-	public Long getExpires_in_sec() {
-		return expires_in_sec;
-	}
-
-	public void setAccess_token(String access_token) {
-		this.access_token = access_token;
-	}
-
-	public void setExpires_in_sec(Long expires_in_sec) {
-		this.expires_in_sec = expires_in_sec;
-	}
 }
diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityLoginViaCookieTest.java b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityLoginViaCookieTest.java
index 3119432..7cdbaae 100644
--- a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityLoginViaCookieTest.java
+++ b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityLoginViaCookieTest.java
@@ -31,8 +31,8 @@ public class SecurityLoginViaCookieTest extends AbstractSecurityLoginTest {
   void givenAnAnonymousUser_whenTheLoginIsSubmitted_thenShouldReturn2xx() {
     ResponseEntity<UserTokenState> responseEntity = doLogin();
     Assertions.assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK);
-    Assertions.assertThat(responseEntity.getBody().getAccess_token()).isNotEmpty();
-    Assertions.assertThat(responseEntity.getBody().getExpires_in_sec()).isNotNull().isPositive();
+    Assertions.assertThat(responseEntity.getBody().getAccessToken()).isNotEmpty();
+    Assertions.assertThat(responseEntity.getBody().getExpiresInSec()).isNotNull().isPositive();
     Assertions.assertThat(responseEntity.getHeaders().get("set-cookie")).hasSizeGreaterThan(0);
     Assertions.assertThat(responseEntity.getHeaders().get("set-cookie").get(0)).startsWith("AUTH-TOKEN");
   }
diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityLoginViaDefaultStrategyTest.java b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityLoginViaDefaultStrategyTest.java
index 864ccd1..178b0d5 100644
--- a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityLoginViaDefaultStrategyTest.java
+++ b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityLoginViaDefaultStrategyTest.java
@@ -22,8 +22,8 @@ public class SecurityLoginViaDefaultStrategyTest extends AbstractSecurityLoginTe
   void givenAnAnonymousUser_whenTheLoginIsSubmitted_thenShouldReturn2xx() {
     ResponseEntity<UserTokenState> responseEntity = doLogin();
     Assertions.assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK);
-    Assertions.assertThat(responseEntity.getBody().getAccess_token()).isNotEmpty();
-    Assertions.assertThat(responseEntity.getBody().getExpires_in_sec()).isNotNull().isPositive();
+    Assertions.assertThat(responseEntity.getBody().getAccessToken()).isNotEmpty();
+    Assertions.assertThat(responseEntity.getBody().getExpiresInSec()).isNotNull().isPositive();
     Assertions.assertThat(responseEntity.getHeaders().get("set-cookie")).isNull();
   }
 
diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityLoginViaHeaderAndLoginFilterTest.java b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityLoginViaHeaderAndLoginFilterTest.java
index 076fcdb..938c4fb 100644
--- a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityLoginViaHeaderAndLoginFilterTest.java
+++ b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityLoginViaHeaderAndLoginFilterTest.java
@@ -30,8 +30,8 @@ public class SecurityLoginViaHeaderAndLoginFilterTest extends AbstractSecurityLo
   void givenAnAnonymousUser_whenTheLoginIsSubmitted_thenShouldReturn2xx() {
     ResponseEntity<UserTokenState> responseEntity = doLogin();
     Assertions.assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK);
-    Assertions.assertThat(responseEntity.getBody().getAccess_token()).isNotEmpty();
-    Assertions.assertThat(responseEntity.getBody().getExpires_in_sec()).isNotNull().isPositive();
+    Assertions.assertThat(responseEntity.getBody().getAccessToken()).isNotEmpty();
+    Assertions.assertThat(responseEntity.getBody().getExpiresInSec()).isNotNull().isPositive();
     Assertions.assertThat(responseEntity.getHeaders().get("set-cookie")).isNull();
   }
 
diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityLoginViaHeaderTest.java b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityLoginViaHeaderTest.java
index eb61e55..b95c77e 100644
--- a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityLoginViaHeaderTest.java
+++ b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityLoginViaHeaderTest.java
@@ -29,8 +29,8 @@ public class SecurityLoginViaHeaderTest extends AbstractSecurityLoginTest {
   void givenAnAnonymousUser_whenTheLoginIsSubmitted_thenShouldReturn2xx() {
     ResponseEntity<UserTokenState> responseEntity = doLogin();
     Assertions.assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK);
-    Assertions.assertThat(responseEntity.getBody().getAccess_token()).isNotEmpty();
-    Assertions.assertThat(responseEntity.getBody().getExpires_in_sec()).isNotNull().isPositive();
+    Assertions.assertThat(responseEntity.getBody().getAccessToken()).isNotEmpty();
+    Assertions.assertThat(responseEntity.getBody().getExpiresInSec()).isNotNull().isPositive();
     Assertions.assertThat(responseEntity.getHeaders().get("set-cookie")).isNull();
   }