Added map naming strategy for hydrator