Better naming conventions. Removed prefix EH_