Updated UIDD and made naming consistent