Remove redundant 'EAP' now were using dictionary values for module names

Add some duplicate dictionary values

More validation of EAP types