fix naming conflict (part 2)