fix name conflicts...