fix name conflicts