Fixed a naming conflict bug