diff --git a/config.py b/config.py
index 4604202..dc0590b 100644
--- a/config.py
+++ b/config.py
@@ -83,7 +83,7 @@ UPPER_WORDS = {
         "sa", "sc", "sts", "svc",
     ),
     "oci": ("oci", "ocid", "oke", "ocir", "ddos", "waf", "bm", "vm", "cdn", "vpn", "dns", "nat", "dms", "api", "id"),
-    "elastic": ("apm", "siem", "ece", "eck"),
+    "elastic": ("apm", "siem", "ece", "eck", "sql"),
     "generic": ("vpn", "ios", "xen", "sql", "lxc"),
     "outscale": ("osc",),
     "openstack": ("rpm", "loci", "nfv", "ec2api"),
@@ -446,7 +446,9 @@ ALIASES = {
     },
     "elastic": {
         "elasticsearch": {
+            "Elasticsearch": "ElasticSearch",
             "Logstash": "LogStash",
+            "MachineLearning": "ML",
         }
     },
     "outscale": {
diff --git a/diagrams/elastic/elasticsearch.py b/diagrams/elastic/elasticsearch.py
index eec16b7..6234eb9 100644
--- a/diagrams/elastic/elasticsearch.py
+++ b/diagrams/elastic/elasticsearch.py
@@ -56,7 +56,7 @@ class SecuritySettings(_Elasticsearch):
     _icon = "security-settings.png"
 
 
-class Sql(_Elasticsearch):
+class SQL(_Elasticsearch):
     _icon = "sql.png"
 
 
@@ -66,4 +66,6 @@ class Stack(_Elasticsearch):
 
 # Aliases
 
+ElasticSearch = Elasticsearch
 LogStash = Logstash
+ML = MachineLearning
diff --git a/diagrams/onprem/registry.py b/diagrams/onprem/registry.py
index 5833e2b..259df50 100644
--- a/diagrams/onprem/registry.py
+++ b/diagrams/onprem/registry.py
@@ -12,7 +12,7 @@ class Harbor(_Registry):
     _icon = "harbor.png"
 
 
-class JFrog(_Registry):
+class Jfrog(_Registry):
     _icon = "jfrog.png"
 
 
diff --git a/docs/nodes/elastic.md b/docs/nodes/elastic.md
index a24d046..bc1c964 100644
--- a/docs/nodes/elastic.md
+++ b/docs/nodes/elastic.md
@@ -57,7 +57,7 @@ Node classes list of elastic provider.
 **diagrams.elastic.elasticsearch.Beats**
 
 <img width="30" src="/img/resources/elastic/elasticsearch/elasticsearch.png" alt="Elasticsearch" style="float: left; padding-right: 5px;" >
-**diagrams.elastic.elasticsearch.Elasticsearch**
+**diagrams.elastic.elasticsearch.Elasticsearch**, **ElasticSearch** (alias)
 
 <img width="30" src="/img/resources/elastic/elasticsearch/kibana.png" alt="Kibana" style="float: left; padding-right: 5px;" >
 **diagrams.elastic.elasticsearch.Kibana**
@@ -69,7 +69,7 @@ Node classes list of elastic provider.
 **diagrams.elastic.elasticsearch.Logstash**, **LogStash** (alias)
 
 <img width="30" src="/img/resources/elastic/elasticsearch/machine-learning.png" alt="MachineLearning" style="float: left; padding-right: 5px;" >
-**diagrams.elastic.elasticsearch.MachineLearning**
+**diagrams.elastic.elasticsearch.MachineLearning**, **ML** (alias)
 
 <img width="30" src="/img/resources/elastic/elasticsearch/map-services.png" alt="MapServices" style="float: left; padding-right: 5px;" >
 **diagrams.elastic.elasticsearch.MapServices**
@@ -86,8 +86,8 @@ Node classes list of elastic provider.
 <img width="30" src="/img/resources/elastic/elasticsearch/security-settings.png" alt="SecuritySettings" style="float: left; padding-right: 5px;" >
 **diagrams.elastic.elasticsearch.SecuritySettings**
 
-<img width="30" src="/img/resources/elastic/elasticsearch/sql.png" alt="Sql" style="float: left; padding-right: 5px;" >
-**diagrams.elastic.elasticsearch.Sql**
+<img width="30" src="/img/resources/elastic/elasticsearch/sql.png" alt="SQL" style="float: left; padding-right: 5px;" >
+**diagrams.elastic.elasticsearch.SQL**
 
 <img width="30" src="/img/resources/elastic/elasticsearch/stack.png" alt="Stack" style="float: left; padding-right: 5px;" >
 **diagrams.elastic.elasticsearch.Stack**