Update es_client registry attribute to use ZCA
Fix name shadowing in list comp