HCOLL-77 renamed classes and added the second cut of UDP