Corrected mapping to remove different names for the same entity.