Fixed a naming collision issue