ENYO-2003 Ares Test: Some Ares widgets are either not formally or not correctly named and should be.

Ready for review