Fixing naming conflict bug.