Converted everything to work correctly with the latest EAK.
Missed a rogue underscore
Merge pull request #15 from WMeldon/eak-update

Converted everything to work correctly with the latest EAK.