diff --git a/api/docs.go b/api/docs.go
index cf85aca06673072cdd2002c6f9db3a993997947d..832bdecba54cc4ff3647cca289f065f13022dcc5 100644
--- a/api/docs.go
+++ b/api/docs.go
@@ -580,9 +580,10 @@ const docTemplate = `{
                     "description": "IPAddr is the IPv4 address",
                     "type": "string"
                 },
-                "lastSeenMillis": {
+                "last_seen_millis": {
                     "description": "LastSeenMillis is a unix time in milliseconds representing the last time we received a heartbeat update from this bridge",
-                    "type": "integer"
+                    "type": "integer",
+                    "format": "int64"
                 },
                 "load": {
                     "description": "Load is the fractional load - but for now menshen agent is not measuring\nload in the bridges.",
@@ -666,9 +667,10 @@ const docTemplate = `{
                     "description": "IPAddr is the IPv4 address",
                     "type": "string"
                 },
-                "lastSeenMillis": {
+                "last_seen_millis": {
                     "description": "LastSeenMillis is a unix time in milliseconds representing the last time we received a heartbeat update from this gateway",
-                    "type": "integer"
+                    "type": "integer",
+                    "format": "int64"
                 },
                 "load": {
                     "description": "Load is the fractional load received from the menshen agent. For the\ntime being it is a synthethic metric that takes into account number of clients\nand network information for the node.",
diff --git a/api/swagger.json b/api/swagger.json
index 48f137616b5af4f7be43569901c9a56f462c62a6..592309c002312554890208484ae3dcfc97233510 100644
--- a/api/swagger.json
+++ b/api/swagger.json
@@ -574,9 +574,10 @@
                     "description": "IPAddr is the IPv4 address",
                     "type": "string"
                 },
-                "lastSeenMillis": {
+                "last_seen_millis": {
                     "description": "LastSeenMillis is a unix time in milliseconds representing the last time we received a heartbeat update from this bridge",
-                    "type": "integer"
+                    "type": "integer",
+                    "format": "int64"
                 },
                 "load": {
                     "description": "Load is the fractional load - but for now menshen agent is not measuring\nload in the bridges.",
@@ -660,9 +661,10 @@
                     "description": "IPAddr is the IPv4 address",
                     "type": "string"
                 },
-                "lastSeenMillis": {
+                "last_seen_millis": {
                     "description": "LastSeenMillis is a unix time in milliseconds representing the last time we received a heartbeat update from this gateway",
-                    "type": "integer"
+                    "type": "integer",
+                    "format": "int64"
                 },
                 "load": {
                     "description": "Load is the fractional load received from the menshen agent. For the\ntime being it is a synthethic metric that takes into account number of clients\nand network information for the node.",
diff --git a/api/swagger.yaml b/api/swagger.yaml
index 534c75bdc0a072b0c78178726cece07b473e32aa..875b79a8936fbd17ed75359f6ad4e22d2ebbc69d 100644
--- a/api/swagger.yaml
+++ b/api/swagger.yaml
@@ -30,9 +30,10 @@ definitions:
       ip6_addr:
         description: IP6Addr is the IPv6 address
         type: string
-      lastSeenMillis:
+      last_seen_millis:
         description: LastSeenMillis is a unix time in milliseconds representing the
           last time we received a heartbeat update from this bridge
+        format: int64
         type: integer
       load:
         description: |-
@@ -109,9 +110,10 @@ definitions:
       ip6_addr:
         description: IP6Addr is the IPv6 address
         type: string
-      lastSeenMillis:
+      last_seen_millis:
         description: LastSeenMillis is a unix time in milliseconds representing the
           last time we received a heartbeat update from this gateway
+        format: int64
         type: integer
       load:
         description: |-
diff --git a/models/models_bridge.go b/models/models_bridge.go
index d98817726e58133a4b03f390932931ec86d80167..524cecccbd2c5eed4a1256516a71dcb697fcc4c2 100644
--- a/models/models_bridge.go
+++ b/models/models_bridge.go
@@ -43,7 +43,7 @@ type ModelsBridge struct {
 	IPAddr string `json:"ip_addr,omitempty"`
 
 	// LastSeenMillis is a unix time in milliseconds representing the last time we received a heartbeat update from this bridge
-	LastSeenMillis int64 `json:"lastSeenMillis,omitempty"`
+	LastSeenMillis int64 `json:"last_seen_millis,omitempty"`
 
 	// Load is the fractional load - but for now menshen agent is not measuring
 	// load in the bridges.
diff --git a/models/models_gateway.go b/models/models_gateway.go
index 9490477cdceb443ffd4f4675f932352ea2806033..7d76b2ae9cc853652bc50463abb03f49aba5a274 100644
--- a/models/models_gateway.go
+++ b/models/models_gateway.go
@@ -43,7 +43,7 @@ type ModelsGateway struct {
 	IPAddr string `json:"ip_addr,omitempty"`
 
 	// LastSeenMillis is a unix time in milliseconds representing the last time we received a heartbeat update from this gateway
-	LastSeenMillis int64 `json:"lastSeenMillis,omitempty"`
+	LastSeenMillis int64 `json:"last_seen_millis,omitempty"`
 
 	// Load is the fractional load received from the menshen agent. For the
 	// time being it is a synthethic metric that takes into account number of clients