rename ambiguous struct names