UHM-1575: Add Location hierarchy for CDI
Fixed some names and parents