Changed enum definitions slightly.

Re-named the enum declaration macros 'ENUM_COUNT' element to '_COUNT' (with underscore as starting char).