diff --git a/doc/API/API-Docs.md b/doc/API/API-Docs.md
index b7bfefd4b9..14ec2bfefb 100644
--- a/doc/API/API-Docs.md
+++ b/doc/API/API-Docs.md
@@ -1 +1 @@
-<meta http-equiv="refresh" content="0; url=/API" />
\ No newline at end of file
+<meta http-equiv="refresh" content="0; url=/API" />
diff --git a/doc/API/ARP.md b/doc/API/ARP.md
index f35f397bfa..adf18b819f 100644
--- a/doc/API/ARP.md
+++ b/doc/API/ARP.md
@@ -24,7 +24,7 @@ Output:
 ```json
 {
     "status": "ok",
-    "err-msg": "",
+    "message": "",
     "count": 1,
     "arp": [
         {
diff --git a/doc/API/Alerts.md b/doc/API/Alerts.md
index 14414c21a5..45092c9bcf 100644
--- a/doc/API/Alerts.md
+++ b/doc/API/Alerts.md
@@ -21,7 +21,7 @@ Output:
 ```json
 {
  "status": "ok",
- "err-msg": "",
+ "message": "",
  "count": 7,
  "alerts": [
   {
@@ -58,7 +58,7 @@ Output:
 ```json
 {
  "status": "ok",
- "err-msg": "",
+ "message": "",
  "message": "Alert has been acknowledged"
 }
 ```
@@ -84,7 +84,7 @@ Output:
 ```json
 {
  "status": "ok",
- "err-msg": "",
+ "message": "",
  "message": "Alert has been unmuted"
 }
 ```
@@ -109,7 +109,7 @@ Output:
 ```json
 {
  "status": "ok",
- "err-msg": "",
+ "message": "",
  "count": 1,
  "alerts": [
   {
@@ -147,7 +147,7 @@ Output:
 ```json
 {
  "status": "ok",
- "err-msg": "",
+ "message": "",
  "count": 1,
  "rules": [
   {
@@ -184,7 +184,7 @@ Output:
 ```json
 {
  "status": "ok",
- "err-msg": "",
+ "message": "",
  "message": "Alert rule has been removed"
 }
 ```
@@ -210,7 +210,7 @@ Output:
 ```json
 {
  "status": "ok",
- "err-msg": "",
+ "message": "",
  "count": 1,
  "rules": [
   {
@@ -255,7 +255,7 @@ Output:
 rules
 {
  "status": "ok",
- "err-msg": ""
+ "message": ""
 }
 ```
 
@@ -290,6 +290,6 @@ Output:
 rules
 {
  "status": "ok",
- "err-msg": ""
+ "message": ""
 }
 ```
diff --git a/doc/API/Bills.md b/doc/API/Bills.md
index 1da6e082b6..1a60bbb534 100644
--- a/doc/API/Bills.md
+++ b/doc/API/Bills.md
@@ -17,7 +17,7 @@ Output:
 ```json
 {
  "status": "ok",
- "err-msg": "",
+ "message": "",
  "count": 1,
  "bills": [
   {
@@ -84,7 +84,7 @@ Output:
 ```json
 {
  "status": "ok",
- "err-msg": "",
+ "message": "",
  "count": 1,
  "bills": [
   {
diff --git a/doc/API/Devices.md b/doc/API/Devices.md
index 1f21254476..8e2a606b29 100644
--- a/doc/API/Devices.md
+++ b/doc/API/Devices.md
@@ -88,7 +88,7 @@ Output:
 ```json
 {
     "status": "ok",
-    "err-msg": "",
+    "message": "",
     "count": 3,
     "graphs": [
         {
@@ -133,7 +133,7 @@ Output:
 ```
 {
     "status": "ok",
-    "err-msg": "",
+    "message": "",
     "count": 2,
     "graphs": [
         {
@@ -157,7 +157,7 @@ Output:
 ```
 {
     "status": "ok",
-    "err-msg": "",
+    "message": "",
     "count": 2,
     "graphs": [
         {
@@ -181,7 +181,7 @@ Output:
 ```
 {
     "status": "ok",
-    "err-msg": "",
+    "message": "",
     "count": 1,
     "graphs": [
         {
@@ -428,7 +428,7 @@ Output:
 ```json
 {
     "status": "ok",
-    "err-msg": "",
+    "message": "",
     "count": 3,
     "ports": [
         {
@@ -461,7 +461,7 @@ Output:
 ```json
 {
     "status": "ok",
-    "err-msg": "",
+    "message": "",
     "addresses": [
         {
           "ipv4_address_id": "290",
@@ -497,7 +497,7 @@ Output:
 ```json
 {
   "status": "ok",
-  "err-msg": "",
+  "message": "",
   "count": 2,
   "mappings": [
     {
@@ -543,7 +543,7 @@ Output:
 ```json
 {
     "status": "ok",
-    "err-msg": "",
+    "message": "",
     "count": 3,
     "components": {
         "2": {
@@ -599,7 +599,7 @@ Output:
 ```json
 {
     "status": "ok",
-    "err-msg": "",
+    "message": "",
     "count": 1,
     "components": {
         "4459": {
@@ -632,7 +632,7 @@ Output:
 ```json
 {
     "status": "ok",
-    "err-msg": "",
+    "message": "",
     "count": 1
 }
 ```
@@ -658,7 +658,7 @@ Output:
 ```json
 {
     "status": "ok",
-    "err-msg": ""
+    "message": ""
 }
 ```
 
diff --git a/doc/API/Inventory.md b/doc/API/Inventory.md
index c537ec3652..2cdb8c5a4f 100644
--- a/doc/API/Inventory.md
+++ b/doc/API/Inventory.md
@@ -22,7 +22,7 @@ Output:
 ```json
 {
     "status": "ok",
-    "err-msg": "",
+    "message": "",
     "count": 1,
     "inventory": [
         {
diff --git a/doc/API/Logs.md b/doc/API/Logs.md
index b7a2252bde..3c563e43ef 100644
--- a/doc/API/Logs.md
+++ b/doc/API/Logs.md
@@ -38,7 +38,7 @@ Output:
 ```json
 {
     "status": "ok",
-    "err-msg": "",
+    "message": "",
     "count": 5,
     "total": "15",
     "logs": [
diff --git a/doc/API/Ports.md b/doc/API/Ports.md
index 7e07701b8f..0b0e2ae59b 100644
--- a/doc/API/Ports.md
+++ b/doc/API/Ports.md
@@ -24,7 +24,7 @@ Output:
 ```json
 {
   "status": "ok",
-  "err-msg": "",
+  "message": "",
   "ports": [
         {
           "ifName": "Gi0/0/0",
@@ -65,7 +65,7 @@ Output:
 ```json
 {
   "status": "ok",
-  "err-msg": "",
+  "message": "",
   "port": [
     {
       "port_id": "323",
@@ -167,7 +167,7 @@ Output:
 ```json
 {
   "status": "ok",
-  "err-msg": "",
+  "message": "",
   "addresses": [
     {
       "ipv4_address_id": "290",
diff --git a/doc/API/Routing.md b/doc/API/Routing.md
index 49bf133e1a..b0152ec418 100644
--- a/doc/API/Routing.md
+++ b/doc/API/Routing.md
@@ -23,7 +23,7 @@ Output:
 ```json
 {
  "status": "ok",
- "err-msg": "",
+ "message": "",
  "bgp_sessions": [
         {
             "bgpPeer_id": "4",
@@ -264,7 +264,7 @@ Output:
 ```json
 {
     "status": "ok",
-    "err-msg": "",
+    "message": "",
     "count": 0,
     "ipsec": [
         "tunnel_id": "1",
diff --git a/doc/API/Services.md b/doc/API/Services.md
index 754c27f5ce..148a0748b8 100644
--- a/doc/API/Services.md
+++ b/doc/API/Services.md
@@ -22,7 +22,7 @@ Output:
 ```json
 {
     "status": "ok",
-    "err-msg": "",
+    "message": "",
     "count": 1,
     "services": [
         [
@@ -84,7 +84,7 @@ Output:
 ```json
 {
     "status": "ok",
-    "err-msg": "",
+    "message": "",
     "count": 1,
     "services": [
         [