Fix duplicate naming