Renamed classes in uiforms to use Eclipse names