diff --git a/elmond/perfsonar-elmond/elmond/app.py b/elmond/perfsonar-elmond/elmond/app.py
index 797c621..4f3919a 100644
--- a/elmond/perfsonar-elmond/elmond/app.py
+++ b/elmond/perfsonar-elmond/elmond/app.py
@@ -38,9 +38,9 @@ def create_app(test_config=None):
     app.config['ELMOND'] = config
     
     #todo: error handling
-    es_hosts = config.get("ELASTIC_HOSTS", ['localhost'])
-    elastic_params = config.get("ELASTIC_PARAMS", {})
-    es = OpenSearch(es_hosts, **elastic_params)
+    es_hosts = config.get("OPENSEARCH_HOSTS", ['localhost'])
+    opensearch_params = config.get("OPENSEARCH_PARAMS", {})
+    es = OpenSearch(es_hosts, **opensearch_params)
 
     #function for dumping a json response
     def json_response(obj):
diff --git a/elmond/perfsonar-elmond/elmond/data.py b/elmond/perfsonar-elmond/elmond/data.py
index 471994e..bbb1a88 100644
--- a/elmond/perfsonar-elmond/elmond/data.py
+++ b/elmond/perfsonar-elmond/elmond/data.py
@@ -53,9 +53,9 @@
 
 log = logging.getLogger('elmond')
     
-def _build_esmond_histogram(elastic_histo, conversion_factor=1):
-    values = elastic_histo.get("values", [])
-    counts = elastic_histo.get("counts", [])
+def _build_esmond_histogram(opensearch_histo, conversion_factor=1):
+    values = opensearch_histo.get("values", [])
+    counts = opensearch_histo.get("counts", [])
     #make sure same length
     num_buckets = len(values)
     if  num_buckets != len(counts):