fix duplicate naming