fix a naming collision