Revert ElasticSearch class name to 0.90 series