diff --git a/Redfish.md b/Redfish.md
index cc5171c..10b8bc6 100644
--- a/Redfish.md
+++ b/Redfish.md
@@ -72,7 +72,7 @@
 - Description
 - Members@odata.count
 - Members
-  - By default will contain 3 roles, "Administrator", "Operator", and "User"
+  - By default will contain 3 roles, "Administrator", "Operator", and "ReadOnly"
 
 #### /redfish/v1/AccountService/Roles/{RoleId}
 ##### Role
@@ -86,8 +86,8 @@
     default
       - Administrator: Login, ConfigureManager, ConfigureUsers, ConfigureSelf,
         ConfigureComponents
-      - Operator: Login, ConfigureComponents
-      - User: Login
+      - Operator: Login, ConfigureComponents, ConfigureSelf
+      - ReadOnly: Login, ConfigureSelf
 
 
 #### /redfish/v1/Chassis
diff --git a/redfish-core/lib/account_service.hpp b/redfish-core/lib/account_service.hpp
index a183f68..7f34949 100644
--- a/redfish-core/lib/account_service.hpp
+++ b/redfish-core/lib/account_service.hpp
@@ -84,7 +84,7 @@
     }
     else if (role == "priv-user")
     {
-        return "User";
+        return "ReadOnly";
     }
     else if (role == "priv-operator")
     {
@@ -102,7 +102,7 @@
     {
         return "priv-callback";
     }
-    else if (role == "User")
+    else if (role == "ReadOnly")
     {
         return "priv-user";
     }
diff --git a/redfish-core/lib/roles.hpp b/redfish-core/lib/roles.hpp
index 782d23c..d170a5c 100644
--- a/redfish-core/lib/roles.hpp
+++ b/redfish-core/lib/roles.hpp
@@ -34,7 +34,7 @@
     }
     else if (priv == "priv-user")
     {
-        return "User";
+        return "ReadOnly";
     }
     else if (priv == "priv-operator")
     {
@@ -55,7 +55,7 @@
     {
         privArray = {"Login", "ConfigureSelf", "ConfigureComponents"};
     }
-    else if (role == "User")
+    else if (role == "ReadOnly")
     {
         privArray = {"Login", "ConfigureSelf"};
     }
