Added UT prefix for all entry type constants