keycloak-memoizeit

diff --git a/examples/admin-client/example-realm.json b/examples/admin-client/example-realm.json
index 3317f48..3ce2eaa 100755
--- a/examples/admin-client/example-realm.json
+++ b/examples/admin-client/example-realm.json
@@ -24,7 +24,7 @@
     ],
     "clients": [
         {
-            "name": "examples-admin-client",
+            "clientId": "examples-admin-client",
             "enabled": true,
             "fullScopeAllowed": true,
             "baseUrl": "/examples-admin-client",

diff --git a/examples/basic-auth/basicauthrealm.json b/examples/basic-auth/basicauthrealm.json
index 0ed1bf5..b8b2acd 100644
--- a/examples/basic-auth/basicauthrealm.json
+++ b/examples/basic-auth/basicauthrealm.json
@@ -43,7 +43,7 @@
     },
     "clients": [
         {
-            "name": "basic-auth-service",
+            "clientId": "basic-auth-service",
             "enabled": true,
             "adminUrl": "/basicauth",
             "baseUrl": "/basicauth",

diff --git a/examples/broker/facebook-authentication/facebook-identity-provider-realm.json b/examples/broker/facebook-authentication/facebook-identity-provider-realm.json
index cc8c636..580ab5a 100644
--- a/examples/broker/facebook-authentication/facebook-identity-provider-realm.json
+++ b/examples/broker/facebook-authentication/facebook-identity-provider-realm.json
@@ -32,7 +32,7 @@
     },
     "clients": [
         {
-            "name": "facebook-authentication",
+            "clientId": "facebook-authentication",
             "enabled": true,
             "publicClient" : true,
             "adminUrl": "/facebook-authentication",

diff --git a/examples/broker/google-authentication/google-identity-provider-realm.json b/examples/broker/google-authentication/google-identity-provider-realm.json
index a721e34..7db619f 100644
--- a/examples/broker/google-authentication/google-identity-provider-realm.json
+++ b/examples/broker/google-authentication/google-identity-provider-realm.json
@@ -32,7 +32,7 @@
     },
     "clients": [
         {
-            "name": "google-authentication",
+            "clientId": "google-authentication",
             "enabled": true,
             "publicClient" : true,
             "adminUrl": "/google-authentication",

diff --git a/examples/broker/saml-broker-authentication/saml-broker-authentication-realm.json b/examples/broker/saml-broker-authentication/saml-broker-authentication-realm.json
index ad757ab..dac9e28 100644
--- a/examples/broker/saml-broker-authentication/saml-broker-authentication-realm.json
+++ b/examples/broker/saml-broker-authentication/saml-broker-authentication-realm.json
@@ -32,7 +32,7 @@
     },
     "clients": [
         {
-            "name": "saml-broker-authentication",
+            "clientId": "saml-broker-authentication",
             "enabled": true,
             "publicClient" : true,
             "adminUrl": "/saml-broker-authentication",

diff --git a/examples/broker/saml-broker-authentication/saml-broker-realm.json b/examples/broker/saml-broker-authentication/saml-broker-realm.json
index 8d0bad4..7ac492b 100644
--- a/examples/broker/saml-broker-authentication/saml-broker-realm.json
+++ b/examples/broker/saml-broker-authentication/saml-broker-realm.json
@@ -28,7 +28,7 @@
     },
     "clients": [
         {
-            "name": "http://localhost:8080/auth/realms/saml-broker-authentication-realm",
+            "clientId": "http://localhost:8080/auth/realms/saml-broker-authentication-realm",
             "protocol": "saml",
             "enabled": true,
             "redirectUris": [

diff --git a/examples/broker/twitter-authentication/twitter-identity-provider-realm.json b/examples/broker/twitter-authentication/twitter-identity-provider-realm.json
index f9add02..e4c94cb 100644
--- a/examples/broker/twitter-authentication/twitter-identity-provider-realm.json
+++ b/examples/broker/twitter-authentication/twitter-identity-provider-realm.json
@@ -33,7 +33,7 @@
     },
     "clients": [
         {
-            "name": "twitter-authentication",
+            "clientId": "twitter-authentication",
             "enabled": true,
             "publicClient" : true,
             "adminUrl": "/twitter-authentication",
@@ -52,7 +52,7 @@
             ]
         },
         {
-          "name": "admin-client",
+          "clientId": "admin-client",
           "enabled": true,
           "fullScopeAllowed": true,
           "baseUrl": "/admin-client",

diff --git a/examples/cordova/example-realm.json b/examples/cordova/example-realm.json
index d07a5d3..13b2864 100755
--- a/examples/cordova/example-realm.json
+++ b/examples/cordova/example-realm.json
@@ -43,7 +43,7 @@
     ],
     "clients": [
         {
-            "name": "cordova",
+            "clientId": "cordova",
             "enabled": true,
             "publicClient": true,
             "redirectUris": ["http://localhost"],

diff --git a/examples/cors/cors-realm.json b/examples/cors/cors-realm.json
index 9e59580..05321fb 100755
--- a/examples/cors/cors-realm.json
+++ b/examples/cors/cors-realm.json
@@ -44,7 +44,7 @@
     ],
     "clients": [
         {
-            "name": "angular-cors-product",
+            "clientId": "angular-cors-product",
             "enabled": true,
             "publicClient": true,
             "baseUrl": "http://localhost:8080/angular-cors-product/index.html",

diff --git a/examples/demo-template/testrealm.json b/examples/demo-template/testrealm.json
index 4b4d669..92643aa 100755
--- a/examples/demo-template/testrealm.json
+++ b/examples/demo-template/testrealm.json
@@ -94,7 +94,7 @@
     ],
     "clients": [
         {
-            "name": "customer-portal",
+            "clientId": "customer-portal",
             "enabled": true,
             "adminUrl": "/customer-portal",
             "baseUrl": "/customer-portal",
@@ -104,7 +104,7 @@
             "secret": "password"
         },
         {
-            "name": "customer-portal-js",
+            "clientId": "customer-portal-js",
             "enabled": true,
             "publicClient": true,
             "baseUrl": "/customer-portal-js",
@@ -113,7 +113,7 @@
             ]
         },
         {
-            "name": "angular-product",
+            "clientId": "angular-product",
             "enabled": true,
             "publicClient": true,
             "baseUrl": "/angular-product/index.html",
@@ -122,7 +122,7 @@
             ]
         },
         {
-            "name": "customer-portal-cli",
+            "clientId": "customer-portal-cli",
             "enabled": true,
             "publicClient": true,
             "redirectUris": [
@@ -131,7 +131,7 @@
             ]
         },
         {
-            "name": "product-portal",
+            "clientId": "product-portal",
             "enabled": true,
             "adminUrl": "/product-portal",
             "baseUrl": "/product-portal",
@@ -141,14 +141,14 @@
             "secret": "password"
         },
         {
-            "name": "database-service",
+            "clientId": "database-service",
             "enabled": true,
             "adminUrl": "/database",
             "baseUrl": "/database",
             "bearerOnly": true
         },
         {
-            "name": "third-party",
+            "clientId": "third-party",
             "enabled": true,
             "consentRequired": true,
             "redirectUris": [
@@ -158,7 +158,7 @@
             "secret": "password"
         },
         {
-            "name": "admin-client",
+            "clientId": "admin-client",
             "enabled": true,
             "publicClient": true,
             "directGrantsOnly": true,

diff --git a/examples/fuse/testrealm.json b/examples/fuse/testrealm.json
index d474e66..f1b21ee 100644
--- a/examples/fuse/testrealm.json
+++ b/examples/fuse/testrealm.json
@@ -136,7 +136,7 @@
     },
     "clients": [
         {
-            "name": "customer-portal",
+            "clientId": "customer-portal",
             "enabled": true,
             "adminUrl": "http://localhost:8181/customer-portal",
             "baseUrl": "http://localhost:8181/customer-portal",
@@ -146,7 +146,7 @@
             "secret": "password"
         },
         {
-            "name": "product-portal",
+            "clientId": "product-portal",
             "enabled": true,
             "adminUrl": "http://localhost:8181/product-portal",
             "baseUrl": "http://localhost:8181/product-portal",
@@ -156,7 +156,7 @@
             "secret": "password"
         },
         {
-            "name": "builtin-cxf-app",
+            "clientId": "builtin-cxf-app",
             "enabled": true,
             "adminUrl": "http://localhost:8181/cxf",
             "baseUrl": "http://localhost:8181/cxf",
@@ -166,21 +166,21 @@
             "secret": "password"
         },
         {
-            "name": "custom-cxf-endpoint",
+            "clientId": "custom-cxf-endpoint",
             "enabled": true,
             "adminUrl": "http://localhost:8282/PersonServiceCF",
             "baseUrl": "http://localhost:8282/PersonServiceCF",
             "bearerOnly": true
         },
         {
-            "name": "admin-camel-endpoint",
+            "clientId": "admin-camel-endpoint",
             "enabled": true,
             "adminUrl": "http://localhost:8383/admin-camel-endpoint",
             "baseUrl": "http://localhost:8383/admin-camel-endpoint",
             "bearerOnly": true
         },
         {
-            "name": "ssh-jmx-admin-client",
+            "clientId": "ssh-jmx-admin-client",
             "enabled": true,
             "publicClient": false,
             "directGrantsOnly": true,
@@ -194,4 +194,4 @@
             "roles": [ "admin", "jmxAdmin" ]
         }
     ]
-}
\ No newline at end of file
+}

diff --git a/examples/js-console/example-realm.json b/examples/js-console/example-realm.json
index 81c92aa..260e938 100755
--- a/examples/js-console/example-realm.json
+++ b/examples/js-console/example-realm.json
@@ -43,7 +43,7 @@
     ],
     "clients": [
         {
-            "name": "js-console",
+            "clientId": "js-console",
             "enabled": true,
             "publicClient": true,
             "baseUrl": "/js-console",

diff --git a/examples/kerberos/kerberosrealm.json b/examples/kerberos/kerberosrealm.json
index 006961c..6b2b999 100644
--- a/examples/kerberos/kerberosrealm.json
+++ b/examples/kerberos/kerberosrealm.json
@@ -15,7 +15,7 @@
     ],
     "clients": [
         {
-            "name": "kerberos-app",
+            "clientId": "kerberos-app",
             "enabled": true,
             "baseUrl": "/kerberos-portal",
             "redirectUris": [
@@ -91,4 +91,4 @@
             }
         }
     ]
-}
\ No newline at end of file
+}

diff --git a/examples/multi-tenant/tenant1-realm.json b/examples/multi-tenant/tenant1-realm.json
index e759b12..8140b51 100644
--- a/examples/multi-tenant/tenant1-realm.json
+++ b/examples/multi-tenant/tenant1-realm.json
@@ -42,7 +42,7 @@
     ],
     "clients": [
         {
-            "name": "multi-tenant",
+            "clientId": "multi-tenant",
             "enabled": true,
             "adminUrl": "/multitenant/tenant1",
             "baseUrl": "/multitenant/tenant1",