removed some es- prefixes
Merge pull request #766 from sabof/remove-es-prefixes

removed some es- prefixes