updated to work with ES and renaming webapps