Fix hierarchy field names